From 6426e9a85f9cc4131cba716224dc90a3b89b9b5b Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Sat, 18 May 2019 18:40:48 +0200 Subject: [PATCH 001/155] Started adding simple events --- core/build.gradle | 2 +- .../core/sms/data/LocalDbRepositoryImpl.java | 10 ++- .../converter/SimpleEventConverter.java | 64 +++++++++++++++++++ ...verter.java => TrackerEventConverter.java} | 6 +- .../sms/domain/interactor/QrCodeCase.java | 4 +- .../sms/domain/interactor/SmsSubmitCase.java | 17 +++-- .../domain/repository/LocalDbRepository.java | 4 +- 7 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java rename core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/{EventConverter.java => TrackerEventConverter.java} (90%) diff --git a/core/build.gradle b/core/build.gradle index 4e2702f7e5..88f8e4265f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -193,7 +193,7 @@ dependencies { api "joda-time:joda-time:2.9.9" // sms compression library - api 'com.github.eHealthAfrica:dhis2-sms-compression:0.0.9' + api 'com.github.eHealthAfrica:dhis2-sms-compression:0.0.12' // Extension which generates mappers for work with cursor and content values api "com.gabrielittner.auto.value:auto-value-cursor-annotations:${libraries.autovaluecursor}" diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java index 6014db7132..d4742d3022 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java @@ -139,7 +139,7 @@ public Completable setMetadataIds(final Metadata metadata) { } @Override - public Single getEventToSubmit(String eventUid, String teiUid) { + public Single getTrackerEventToSubmit(String eventUid, String teiUid) { return Single.fromCallable(() -> eventModule.events.withTrackedEntityDataValues() .byUid().eq(eventUid).one().get().toBuilder() @@ -148,6 +148,14 @@ public Single getEventToSubmit(String eventUid, String teiUid) { ); } + @Override + public Single getSimpleEventToSubmit(String eventUid) { + return Single.fromCallable(() -> + eventModule.events.withTrackedEntityDataValues() + .byUid().eq(eventUid).one().get() + ); + } + @Override public Single getTeiEnrollmentToSubmit(String enrollmentUid, String teiUid) { return Single.fromCallable(() -> { diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java new file mode 100644 index 0000000000..94400e1c72 --- /dev/null +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java @@ -0,0 +1,64 @@ +package org.hisp.dhis.android.core.sms.domain.converter; + +import androidx.annotation.NonNull; + +import org.hisp.dhis.android.core.common.State; +import org.hisp.dhis.android.core.event.Event; +import org.hisp.dhis.android.core.sms.domain.repository.LocalDbRepository; +import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; +import org.hisp.dhis.smscompression.models.DataValue; +import org.hisp.dhis.smscompression.models.SMSSubmission; +import org.hisp.dhis.smscompression.models.SimpleEventSMSSubmission; + +import java.util.ArrayList; +import java.util.List; + +import io.reactivex.Completable; +import io.reactivex.Single; + +public class SimpleEventConverter extends Converter { + private final String eventUid; + + public SimpleEventConverter(LocalDbRepository localDbRepository, String eventUid) { + super(localDbRepository); + this.eventUid = eventUid; + } + + @Override + public Single convert(@NonNull Event e, String user) { + return Single.fromCallable(() -> { + SimpleEventSMSSubmission subm = new SimpleEventSMSSubmission(); + subm.setEventProgram(e.program()); + subm.setAttributeOptionCombo(e.attributeOptionCombo()); + subm.setEvent(e.uid()); + subm.setTimestamp(e.lastUpdated()); + subm.setValues(convertDataValues(e.attributeOptionCombo(), e.trackedEntityDataValues())); + subm.setOrgUnit(e.organisationUnit()); + subm.setUserID(user); + return subm; + }); + } + + @Override + public Completable updateSubmissionState(State state) { + return getLocalDbRepository().updateEventSubmissionState(eventUid, state); + } + + @Override + Single readItemFromDb() { + return getLocalDbRepository().getSimpleEventToSubmit(eventUid); + } + + @SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"}) + private List convertDataValues(String catOptionCombo, + List trackedEntityDataValues) { + ArrayList dataValues = new ArrayList<>(); + if (trackedEntityDataValues == null) { + return dataValues; + } + for (TrackedEntityDataValue tedv : trackedEntityDataValues) { + dataValues.add(new DataValue(catOptionCombo, tedv.dataElement(), tedv.value())); + } + return dataValues; + } +} diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EventConverter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EventConverter.java rename to core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java index a1294b6913..ee479ce8ac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EventConverter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java @@ -16,11 +16,11 @@ import io.reactivex.Completable; import io.reactivex.Single; -public class EventConverter extends Converter { +public class TrackerEventConverter extends Converter { private final String eventUid; private final String teiUid; - public EventConverter(LocalDbRepository localDbRepository, String eventUid, String teiUid) { + public TrackerEventConverter(LocalDbRepository localDbRepository, String eventUid, String teiUid) { super(localDbRepository); this.eventUid = eventUid; this.teiUid = teiUid; @@ -49,7 +49,7 @@ public Completable updateSubmissionState(State state) { @Override Single readItemFromDb() { - return getLocalDbRepository().getEventToSubmit(eventUid, teiUid); + return getLocalDbRepository().getTrackerEventToSubmit(eventUid, teiUid); } @SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"}) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java index 475720d83a..77226abf59 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java @@ -1,7 +1,7 @@ package org.hisp.dhis.android.core.sms.domain.interactor; import org.hisp.dhis.android.core.sms.domain.converter.EnrollmentConverter; -import org.hisp.dhis.android.core.sms.domain.converter.EventConverter; +import org.hisp.dhis.android.core.sms.domain.converter.TrackerEventConverter; import org.hisp.dhis.android.core.sms.domain.repository.LocalDbRepository; import io.reactivex.Single; @@ -14,7 +14,7 @@ public QrCodeCase(LocalDbRepository localDbRepository) { } public Single generateEventCode(String eventUid, String teiUid) { - return new EventConverter(localDbRepository, eventUid, teiUid).readAndConvert(); + return new TrackerEventConverter(localDbRepository, eventUid, teiUid).readAndConvert(); } public Single generateEnrollmentCode(String enrollmentUid, String teiUid) { diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java index 542f4edb57..68ed7f46bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java @@ -6,7 +6,8 @@ import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.sms.domain.converter.Converter; import org.hisp.dhis.android.core.sms.domain.converter.EnrollmentConverter; -import org.hisp.dhis.android.core.sms.domain.converter.EventConverter; +import org.hisp.dhis.android.core.sms.domain.converter.SimpleEventConverter; +import org.hisp.dhis.android.core.sms.domain.converter.TrackerEventConverter; import org.hisp.dhis.android.core.sms.domain.repository.DeviceStateRepository; import org.hisp.dhis.android.core.sms.domain.repository.LocalDbRepository; import org.hisp.dhis.android.core.sms.domain.repository.SmsRepository; @@ -33,9 +34,13 @@ public SmsSubmitCase(LocalDbRepository localDbRepository, SmsRepository smsRepos this.deviceStateRepository = deviceStateRepository; } - public Single convertEvent(String eventUid, - String teiUid) { - return convert(new EventConverter(localDbRepository, eventUid, teiUid)); + public Single convertTrackerEvent(String eventUid, + String teiUid) { + return convert(new TrackerEventConverter(localDbRepository, eventUid, teiUid)); + } + + public Single convertSimpleEvent(String eventUid) { + return convert(new SimpleEventConverter(localDbRepository, eventUid)); } public Single convertEnrollment(String enrollmentUid, @@ -48,7 +53,9 @@ private Single convert(Converter converter) { return Single.error(new IllegalStateException("SMS submit case should be used once")); } this.converter = converter; - return converter.readAndConvert().flatMap( + return checkPreconditions().andThen( + converter.readAndConvert() + ).flatMap( smsRepository::generateSmsParts ).map(parts -> { smsParts = parts; diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java index 8bfd0f32aa..b087ba517f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java @@ -28,7 +28,9 @@ public interface LocalDbRepository { Completable setMetadataIds(Metadata metadata); - Single getEventToSubmit(String eventUid, String teiUid); + Single getTrackerEventToSubmit(String eventUid, String teiUid); + + Single getSimpleEventToSubmit(String eventUid); Single getTeiEnrollmentToSubmit(String enrollmentUid, String teiUid); From dd4a20300342e5728a872cd7e12c8dc2d8ba8e68 Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Thu, 23 May 2019 18:38:40 +0200 Subject: [PATCH 002/155] Adding submission ids --- .../core/sms/data/LocalDbRepositoryImpl.java | 65 +++++++++++++++++++ .../core/sms/domain/converter/Converter.java | 12 ++-- .../domain/converter/EnrollmentConverter.java | 3 +- .../converter/SimpleEventConverter.java | 3 +- .../converter/TrackerEventConverter.java | 3 +- .../sms/domain/interactor/QrCodeCase.java | 7 +- .../sms/domain/interactor/SmsSubmitCase.java | 65 +++++++++++++------ .../domain/repository/LocalDbRepository.java | 8 +++ 8 files changed, 138 insertions(+), 28 deletions(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java index d4742d3022..9930d3467c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java @@ -2,6 +2,7 @@ import android.content.Context; import android.content.SharedPreferences; +import android.util.Log; import org.hisp.dhis.android.core.ObjectMapperFactory; import org.hisp.dhis.android.core.common.State; @@ -19,14 +20,19 @@ import org.hisp.dhis.smscompression.models.Metadata; import java.io.IOException; +import java.util.Collection; import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import javax.inject.Inject; import io.reactivex.Completable; import io.reactivex.Single; +import io.reactivex.functions.Consumer; public class LocalDbRepositoryImpl implements LocalDbRepository { + private static final String TAG = LocalDbRepositoryImpl.class.getSimpleName(); private final Context context; private final UserModule userModule; private final TrackedEntityModule trackedEntityModule; @@ -41,6 +47,9 @@ public class LocalDbRepositoryImpl implements LocalDbRepository { private final static String KEY_WAITING_RESULT_TIMEOUT = "reading_timeout"; private static final String KEY_METADATA_CONFIG = "metadata_conf"; private static final String KEY_MODULE_ENABLED = "module_enabled"; + private static final String KEY_SUBMISSIONS_IDS = "submissions_ids"; + + private Collection ongoingSubmissionIds = null; @Inject public LocalDbRepositoryImpl(Context ctx, @@ -218,4 +227,60 @@ public Single isModuleEnabled() { .getBoolean(KEY_MODULE_ENABLED, false) ); } + + @Override + public Single> getOngoingSubmissionsIds() { + if (ongoingSubmissionIds != null) { + return Single.just(ongoingSubmissionIds); + } + return Single.fromCallable(() -> { + Set set = context.getSharedPreferences(CONFIG_FILE, Context.MODE_PRIVATE) + .getStringSet(KEY_SUBMISSIONS_IDS, new HashSet<>()); + HashSet numSet = new HashSet<>(); + if (set == null) return numSet; + for (String val : set) { + try { + numSet.add(Integer.parseInt(val)); + } catch (NumberFormatException e) { + Log.e(TAG, "Failed parsing submission id", e); + } + } + return numSet; + } + ); + } + + @Override + public Completable addOngoingSubmissionsId(Integer id) { + return getOngoingSubmissionsIds().map(ids -> { + ids.add(id); + return ids; + }).doOnSuccess( + saveOngoingSubmissionsIds() + ).ignoreElement(); + } + + @Override + public Completable removeOngoingSubmissionsId(Integer id) { + return getOngoingSubmissionsIds().map(ids -> { + ids.remove(id); + return ids; + }).doOnSuccess( + saveOngoingSubmissionsIds() + ).ignoreElement(); + } + + private Consumer> saveOngoingSubmissionsIds() { + return ids -> { + HashSet set = new HashSet<>(); + for (Integer id : ids) { + set.add(Integer.toString(id)); + } + boolean result = context.getSharedPreferences(CONFIG_FILE, Context.MODE_PRIVATE) + .edit().putStringSet(KEY_SUBMISSIONS_IDS, set).commit(); + if (!result) { + throw new IOException("Failed writing submission ids to local storage"); + } + }; + } } diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/Converter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/Converter.java index 35e5c1f527..2402d4a5fe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/Converter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/Converter.java @@ -22,13 +22,17 @@ public Converter(LocalDbRepository localDbRepository) { } public Single readAndConvert() { + return readAndConvert(0); + } + + public Single readAndConvert(int submissionId) { return Single.zip( localDbRepository.getMetadataIds(), localDbRepository.getUserName(), readItemFromDb(), CompressionData::new ).flatMap( - d -> convert(d.item, d.metadata, d.user) + d -> convert(d.item, d.metadata, d.user, submissionId) ); } @@ -36,8 +40,8 @@ public Single readAndConvert() { * @param dataItem object to convert * @return text ready to be sent by sms */ - private Single convert(@NonNull P dataItem, Metadata metadata, String user) { - return convert(dataItem, user).map(submission -> { + private Single convert(@NonNull P dataItem, Metadata metadata, String user, Integer submissionId) { + return convert(dataItem, user, submissionId).map(submission -> { SMSSubmissionWriter writer = new SMSSubmissionWriter(metadata); return base64(writer.compress(submission)); }); @@ -62,7 +66,7 @@ LocalDbRepository getLocalDbRepository() { return localDbRepository; } - abstract Single convert(@NonNull P dataItem, String user); + abstract Single convert(@NonNull P dataItem, String user, int submissionId); public abstract Completable updateSubmissionState(State state); diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EnrollmentConverter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EnrollmentConverter.java index 24cb286ec1..f9587300df 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EnrollmentConverter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/EnrollmentConverter.java @@ -30,7 +30,7 @@ public EnrollmentConverter(LocalDbRepository localDbRepository, String enrollmen } @Override - public Single convert(@NonNull TrackedEntityInstance tei, String user) { + public Single convert(@NonNull TrackedEntityInstance tei, String user, int submissionId) { List enrollments = tei.enrollments(); if (enrollments == null || enrollments.size() != 1) { return Single.error( @@ -48,6 +48,7 @@ public Single convert(@NonNull TrackedEntityInstance te return Single.fromCallable(() -> { Enrollment enrollment = enrollments.get(0); EnrollmentSMSSubmission subm = new EnrollmentSMSSubmission(); + subm.setSubmissionID(submissionId); subm.setUserID(user); subm.setOrgUnit(enrollment.organisationUnit()); subm.setTrackerProgram(enrollment.program()); diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java index 94400e1c72..389eebbcf5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/SimpleEventConverter.java @@ -25,9 +25,10 @@ public SimpleEventConverter(LocalDbRepository localDbRepository, String eventUid } @Override - public Single convert(@NonNull Event e, String user) { + public Single convert(@NonNull Event e, String user, int submissionId) { return Single.fromCallable(() -> { SimpleEventSMSSubmission subm = new SimpleEventSMSSubmission(); + subm.setSubmissionID(submissionId); subm.setEventProgram(e.program()); subm.setAttributeOptionCombo(e.attributeOptionCombo()); subm.setEvent(e.uid()); diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java index ee479ce8ac..bd182afa5a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java @@ -27,9 +27,10 @@ public TrackerEventConverter(LocalDbRepository localDbRepository, String eventUi } @Override - public Single convert(@NonNull Event e, String user) { + public Single convert(@NonNull Event e, String user, int submissionId) { return Single.fromCallable(() -> { TrackerEventSMSSubmission subm = new TrackerEventSMSSubmission(); + subm.setSubmissionID(submissionId); subm.setAttributeOptionCombo(e.attributeOptionCombo()); subm.setEvent(e.uid()); subm.setProgramStage(e.programStage()); diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java index 77226abf59..b41c67b7f5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/QrCodeCase.java @@ -1,6 +1,7 @@ package org.hisp.dhis.android.core.sms.domain.interactor; import org.hisp.dhis.android.core.sms.domain.converter.EnrollmentConverter; +import org.hisp.dhis.android.core.sms.domain.converter.SimpleEventConverter; import org.hisp.dhis.android.core.sms.domain.converter.TrackerEventConverter; import org.hisp.dhis.android.core.sms.domain.repository.LocalDbRepository; @@ -13,7 +14,11 @@ public QrCodeCase(LocalDbRepository localDbRepository) { this.localDbRepository = localDbRepository; } - public Single generateEventCode(String eventUid, String teiUid) { + public Single generateSimpleEventCode(String eventUid) { + return new SimpleEventConverter(localDbRepository, eventUid).readAndConvert(); + } + + public Single generateTrackerEventCode(String eventUid, String teiUid) { return new TrackerEventConverter(localDbRepository, eventUid, teiUid).readAndConvert(); } diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java index 68ed7f46bf..79aa5529cc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java @@ -26,6 +26,8 @@ public class SmsSubmitCase { private final DeviceStateRepository deviceStateRepository; private Converter converter; private List smsParts; + private Integer submissionId; + private boolean finishedSending = false; public SmsSubmitCase(LocalDbRepository localDbRepository, SmsRepository smsRepository, DeviceStateRepository deviceStateRepository) { @@ -53,13 +55,26 @@ private Single convert(Converter converter) { return Single.error(new IllegalStateException("SMS submit case should be used once")); } this.converter = converter; - return checkPreconditions().andThen( - converter.readAndConvert() - ).flatMap( - smsRepository::generateSmsParts - ).map(parts -> { - smsParts = parts; - return parts.size(); + return checkPreconditions() + .andThen(generateSubmissionId() + ).flatMap(converter::readAndConvert + ).flatMap(smsRepository::generateSmsParts + ).map(parts -> { + smsParts = parts; + return parts.size(); + }); + } + + private Single generateSubmissionId() { + return localDbRepository.getOngoingSubmissionsIds().flatMap(ids -> { + for (int i = 0; i <= 255; i++) { + if (!ids.contains(i)) { + submissionId = i; + return Single.just(i); + } + } + submissionId = null; + return Single.error(new TooManySubmissionsException()); }); } @@ -67,18 +82,22 @@ public Observable send() { if (smsParts == null || smsParts.isEmpty()) { return Observable.error(new IllegalStateException("Convert method should be called first")); } - return checkPreconditions() - .andThen( - localDbRepository.getGatewayNumber() - ).flatMapObservable(number -> - smsRepository.sendSms(number, smsParts, SENDING_TIMEOUT)) - .flatMap(smsSendingState -> { - if (smsSendingState.getSent() == smsSendingState.getTotal()) { - return converter.updateSubmissionState(State.SENT_VIA_SMS) - .andThen(Observable.just(smsSendingState)); - } - return Observable.just(smsSendingState); - }); + return checkPreconditions( + ).andThen( + localDbRepository.addOngoingSubmissionsId(submissionId) + ).andThen( + localDbRepository.getGatewayNumber() + ).flatMapObservable(number -> + smsRepository.sendSms(number, smsParts, SENDING_TIMEOUT) + ).flatMap(state -> { + if (!finishedSending && state.getSent() == state.getTotal()) { + finishedSending = true; + return converter.updateSubmissionState(State.SENT_VIA_SMS).andThen( + localDbRepository.removeOngoingSubmissionsId(submissionId) + ).andThen(Observable.just(state)); + } + return Observable.just(state); + }); } public Completable checkConfirmationSms(final boolean searchReceived, @@ -130,7 +149,7 @@ private Completable mapFail(Single precondition, PreconditionFailed.Typ public static class PreconditionFailed extends Throwable { private final Type type; - public PreconditionFailed(Type type) { + PreconditionFailed(Type type) { this.type = type; } @@ -149,4 +168,10 @@ public enum Type { SMS_MODULE_DISABLED } } + + public static class TooManySubmissionsException extends IllegalStateException { + TooManySubmissionsException() { + super("Too many ongoing submissions at the same time >255"); + } + } } diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java index b087ba517f..af95ab0da0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java @@ -5,6 +5,8 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import org.hisp.dhis.smscompression.models.Metadata; +import java.util.Collection; + import io.reactivex.Completable; import io.reactivex.Single; @@ -45,4 +47,10 @@ public interface LocalDbRepository { Completable setModuleEnabled(boolean enabled); Single isModuleEnabled(); + + Single> getOngoingSubmissionsIds(); + + Completable addOngoingSubmissionsId(Integer id); + + Completable removeOngoingSubmissionsId(Integer id); } From db705be4adcdd99bd4b7d9f17332598deefb4bb5 Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Tue, 28 May 2019 16:13:50 +0200 Subject: [PATCH 003/155] [ANDROSDK-160] Remove trackedEntityInstance in Event; migration --- core/src/main/assets/migrations/50.yaml | 7 +++++++ .../android/core/data/database/DbOpenHelper.java | 2 +- .../org/hisp/dhis/android/core/event/Event.java | 6 ------ .../core/event/EventCollectionRepository.java | 13 +++++++++++-- .../hisp/dhis/android/core/event/EventModel.java | 7 ------- .../dhis/android/core/event/EventStoreImpl.java | 1 - .../dhis/android/core/event/EventTableInfo.java | 4 +--- .../core/data/trackedentity/EventSamples.java | 1 - 8 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 core/src/main/assets/migrations/50.yaml diff --git a/core/src/main/assets/migrations/50.yaml b/core/src/main/assets/migrations/50.yaml new file mode 100644 index 0000000000..1a6148ea80 --- /dev/null +++ b/core/src/main/assets/migrations/50.yaml @@ -0,0 +1,7 @@ +up: +- BEGIN TRANSACTION; +- ALTER TABLE Event RENAME TO Event_Old; +- CREATE TABLE Event (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, enrollment TEXT, created TEXT, lastUpdated TEXT, createdAtClient TEXT, lastUpdatedAtClient TEXT, status TEXT, latitude TEXT, longitude TEXT, program TEXT NOT NULL, programStage TEXT NOT NULL, organisationUnit TEXT NOT NULL, eventDate TEXT, completedDate TEXT, dueDate TEXT, state TEXT, attributeOptionCombo TEXT, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (enrollment) REFERENCES Enrollment (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED); +- INSERT INTO Event (_id, uid, enrollment, created, lastUpdated, createdAtClient, lastUpdatedAtClient, status, latitude, longitude, program, programStage, organisationUnit, eventDate, completedDate, dueDate, state, attributeOptionCombo) SELECT _id, uid, enrollment, created, lastUpdated, createdAtClient, lastUpdatedAtClient, status, latitude, longitude, program, programStage, organisationUnit, eventDate, completedDate, dueDate, state, attributeOptionCombo FROM Event_Old; +- DROP TABLE Event_Old; +- COMMIT; \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java b/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java index c39c2529ac..22427acf30 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java @@ -44,7 +44,7 @@ public class DbOpenHelper extends SQLBriteOpenHelper { - public static final int VERSION = 49; + public static final int VERSION = 50; public DbOpenHelper(@NonNull Context context, @Nullable String databaseName) { super(context, databaseName, null, VERSION); diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java index b6fd8d8725..80d0221b87 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java @@ -129,10 +129,6 @@ public abstract class Event extends BaseDataModel implements ObjectWithDeleteInt @JsonProperty() public abstract String attributeOptionCombo(); - @Nullable - @JsonIgnore() - public abstract String trackedEntityInstance(); - @Nullable @JsonProperty(EventFields.TRACKED_ENTITY_DATA_VALUES) @ColumnAdapter(IgnoreTrackedEntityDataValueListColumnAdapter.class) @@ -187,8 +183,6 @@ public abstract static class Builder extends BaseDataModel.Builder { public abstract Builder attributeOptionCombo(String attributeOptionCombo); - public abstract Builder trackedEntityInstance(String trackedEntityInstance); - @JsonProperty(EventFields.TRACKED_ENTITY_DATA_VALUES) public abstract Builder trackedEntityDataValues(List trackedEntityDataValues); diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java index 9a4b6761d7..d2db45e6e1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java @@ -37,11 +37,15 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; +import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.DataStatePropagator; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.Transformer; +import org.hisp.dhis.android.core.enrollment.EnrollmentFields; +import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo; import org.hisp.dhis.android.core.imports.WebResponse; +import java.util.List; import java.util.Map; import java.util.concurrent.Callable; @@ -156,8 +160,13 @@ public StringFilterConnector byAttributeOptionComboUi return cf.string(EventFields.ATTRIBUTE_OPTION_COMBO); } - public StringFilterConnector byTrackedEntityInstaceUid() { - return cf.string(EventTableInfo.Columns.TRACKED_ENTITY_INSTANCE); + public EventCollectionRepository byTrackedEntityInstanceUids(List uids) { + return cf.subQuery(EventFields.ENROLLMENT).inLinkTable( + EnrollmentTableInfo.TABLE_INFO.name(), + BaseIdentifiableObjectModel.Columns.UID, + EnrollmentFields.TRACKED_ENTITY_INSTANCE, + uids + ); } public EventCollectionRepository withTrackedEntityDataValues() { diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java index 0d6c5eeb62..c508ace2fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java @@ -65,7 +65,6 @@ public static class Columns extends BaseDataModel.Columns { public static final String COMPLETE_DATE = "completedDate"; public static final String DUE_DATE = "dueDate"; public static final String ATTRIBUTE_OPTION_COMBO = "attributeOptionCombo"; - public static final String TRACKED_ENTITY_INSTANCE = "trackedEntityInstance"; } public static EventModel create(Cursor cursor) { @@ -147,10 +146,6 @@ public static Builder builder() { @ColumnName(Columns.ATTRIBUTE_OPTION_COMBO) public abstract String attributeOptionCombo(); - @Nullable - @ColumnName(Columns.TRACKED_ENTITY_INSTANCE) - public abstract String trackedEntityInstance(); - @AutoValue.Builder public static abstract class Builder extends BaseDataModel.Builder { public abstract Builder uid(@NonNull String uid); @@ -185,8 +180,6 @@ public static abstract class Builder extends BaseDataModel.Builder { public abstract Builder attributeOptionCombo(@Nullable String attributeOptionCombo); - public abstract Builder trackedEntityInstance(@Nullable String trackedEntityInstance); - public abstract EventModel build(); } } diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java index d6e89aa77c..6ccdc95e92 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java @@ -75,7 +75,6 @@ public final class EventStoreImpl extends IdentifiableObjectWithStateStoreImpl Date: Tue, 28 May 2019 16:31:46 +0200 Subject: [PATCH 004/155] [ANDROSDK-160] Android tests --- .../DataStatePropagatorIntegrationShould.java | 6 ++-- .../core/data/database/DatabaseAssert.java | 2 +- .../EventPostCallRealIntegrationShould.java | 12 +++---- ...InstancePostCallRealIntegrationShould.java | 2 +- .../api/TrackedEntityInstanceUtils.java | 34 +++++++++---------- ...ectionRepositoryMockIntegrationShould.java | 3 +- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/DataStatePropagatorIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/DataStatePropagatorIntegrationShould.java index f9fa36bd8c..2fc367beb6 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/DataStatePropagatorIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/DataStatePropagatorIntegrationShould.java @@ -137,8 +137,7 @@ public void assertThatSetTeiToUpdateWhenEventPropagation(State state) throws D2E trackedEntityInstanceStore.setState(teiUid, state); enrollmentStore.setState(enrolmentUid, state); - propagator.propagateEventState(Event.builder() - .trackedEntityInstance(teiUid).enrollment(enrolmentUid).build()); + propagator.propagateEventState(Event.builder().enrollment(enrolmentUid).build()); assertThat(trackedEntityInstanceStore.selectByUid(teiUid).state(), is(State.TO_UPDATE)); assertThat(enrollmentStore.selectByUid(enrolmentUid).state(), is(State.TO_UPDATE)); @@ -154,8 +153,7 @@ public void assertThatDoNotSetTeiToUpdateWhenEventPropagation(State state) throw trackedEntityInstanceStore.setState(teiUid, state); enrollmentStore.setState(enrolmentUid, state); - propagator.propagateEventState(Event.builder() - .trackedEntityInstance(teiUid).enrollment(enrolmentUid).build()); + propagator.propagateEventState(Event.builder().enrollment(enrolmentUid).build()); assertThat(trackedEntityInstanceStore.selectByUid(teiUid).state(), is(state)); assertThat(enrollmentStore.selectByUid(enrolmentUid).state(), is(state)); diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.java index 73cd9dc2ee..febcae2eca 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.java @@ -93,7 +93,7 @@ private int tableCount(String tableName) { int count = 0; try { - cursor = databaseAdapter.query("SELECT * from " + tableName, null); + cursor = databaseAdapter.query("SELECT * from " + tableName); count = cursor.getCount(); } finally { if (cursor != null) { diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallRealIntegrationShould.java index ba81003bf7..4ebdb895af 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallRealIntegrationShould.java @@ -94,7 +94,7 @@ public void successful_response_after_sync_events() throws Exception { downloadMetadata(); createDummyDataToPost(orgUnitUid, programUid, programStageUid, eventUid1, - dataElementUid, attributeOptionCombo, null); + dataElementUid, attributeOptionCombo); d2.eventModule().events.upload().call(); } @@ -105,7 +105,7 @@ public void pull_event_with_correct_category_combo_after_be_pushed() throws Exce downloadMetadata(); createDummyDataToPost(orgUnitUid, programUid, programStageUid, eventUid1, dataElementUid, - attributeOptionCombo, null); + attributeOptionCombo); pushDummyEvent(); @@ -126,10 +126,10 @@ public void pull_two_events_with_correct_category_combo_after_be_pushed() throws downloadMetadata(); createDummyDataToPost(orgUnitUid, programUid, programStageUid, eventUid1, dataElementUid, - attributeOptionCombo, null); + attributeOptionCombo); createDummyDataToPost(orgUnitUid, programUid, programStageUid, eventUid2, dataElementUid, - attributeOptionCombo, null); + attributeOptionCombo); pushDummyEvent(); @@ -146,13 +146,13 @@ public void pull_two_events_with_correct_category_combo_after_be_pushed() throws private void createDummyDataToPost(String orgUnitUid, String programUid, String programStageUid, String eventUid, - String dataElementUid, String attributeOptionCombo, String trackedEntityInstance) { + String dataElementUid, String attributeOptionCombo) { eventStore.insert(Event.builder().uid(eventUid).created(new Date()).lastUpdated(new Date()) .status(EventStatus.ACTIVE).coordinate(Coordinates.create(13.21, 12.21)).program(programUid) .programStage(programStageUid).organisationUnit(orgUnitUid).eventDate(new Date()) .completedDate(new Date()).dueDate(new Date()).state(State.TO_POST) - .attributeOptionCombo(attributeOptionCombo).trackedEntityInstance(trackedEntityInstance).build()); + .attributeOptionCombo(attributeOptionCombo).build()); TrackedEntityDataValue trackedEntityDataValue = TrackedEntityDataValue.builder() .event(eventUid) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java index c94cb4a824..9420566866 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java @@ -479,7 +479,7 @@ private void createDummyDataToPost(String orgUnitUid, String programUid, String .status(EventStatus.ACTIVE).coordinate(Coordinates.create(13.21, 12.21)).program(programUid) .programStage(programStageUid).organisationUnit(orgUnitUid).eventDate(refDate).dueDate(refDate) .completedDate(refDate).state(State.TO_POST).attributeOptionCombo(categoryComboOptionUid) - .trackedEntityInstance(trackedEntityInstanceUid).build(); + .build(); eventStore.insert(event); diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceUtils.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceUtils.java index 96c8209a7c..9900e2a3d0 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceUtils.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceUtils.java @@ -220,7 +220,7 @@ private static Enrollment createFutureEnrollment(String teiUid) { private static Enrollment createValidEnrollmentAndEvent(String teiUid) { Date refDate = getValidDate(); String enrollmentUid = codeGenerator.generate(); - Event event = createValidEvent(teiUid, enrollmentUid); + Event event = createValidEvent(enrollmentUid); return getEnrollment(enrollmentUid, teiUid, refDate).toBuilder() .events(Collections.singletonList(event)).build(); @@ -229,7 +229,7 @@ private static Enrollment createValidEnrollmentAndEvent(String teiUid) { private static Enrollment createEnrollmentAndFutureEvent(String teiUid) { Date refDate = getValidDate(); String enrollmentUid = codeGenerator.generate(); - Event event = createFutureEvent(teiUid, enrollmentUid); + Event event = createFutureEvent(enrollmentUid); return getEnrollment(enrollmentUid, teiUid, refDate).toBuilder() .events(Collections.singletonList(event)).build(); @@ -238,7 +238,7 @@ private static Enrollment createEnrollmentAndFutureEvent(String teiUid) { private static Enrollment createEnrollmentAndEventWithInvalidDataElement(String teiUid) { Date refDate = getValidDate(); String enrollmentUid = codeGenerator.generate(); - Event event = createEventWithInvalidDataElement(teiUid, enrollmentUid); + Event event = createEventWithInvalidDataElement(enrollmentUid); return getEnrollment(enrollmentUid, teiUid, refDate).toBuilder() .events(Collections.singletonList(event)).build(); @@ -247,7 +247,7 @@ private static Enrollment createEnrollmentAndEventWithInvalidDataElement(String private static Enrollment createEnrollmentAndEventWithValidAndInvalidDataValue(String teiUid) { Date refDate = getValidDate(); String enrollmentUid = codeGenerator.generate(); - Event event = createEventWithValidAndInvalidDataValue(teiUid, enrollmentUid); + Event event = createEventWithValidAndInvalidDataValue(enrollmentUid); return getEnrollment(enrollmentUid, teiUid, refDate).toBuilder() .events(Collections.singletonList(event)).build(); @@ -256,7 +256,7 @@ private static Enrollment createEnrollmentAndEventWithValidAndInvalidDataValue(S private static Enrollment createCompletedEnrollmentWithEvent(String teiUid) { Date refDate = getValidDate(); String enrollmentUid = codeGenerator.generate(); - Event event = createValidCompletedEvent(teiUid, enrollmentUid); + Event event = createValidCompletedEvent(enrollmentUid); return getEnrollment(enrollmentUid, teiUid, refDate).toBuilder() .status(EnrollmentStatus.COMPLETED) @@ -270,8 +270,8 @@ private static Enrollment getEnrollment(String enrollmentUid, String teiUid, Dat .events(Collections.emptyList()).notes(Collections.emptyList()).build(); } - private static Event createValidEvent(String teiUid, String enrollmentUid) { - return createEvent(teiUid, enrollmentUid, getValidDate(), + private static Event createValidEvent(String enrollmentUid) { + return createEvent(enrollmentUid, getValidDate(), Collections.singletonList(TrackedEntityDataValue.builder() .dataElement(validNumberDataElementUid) .value("9") @@ -279,7 +279,7 @@ private static Event createValidEvent(String teiUid, String enrollmentUid) { .build())); } - private static Event createValidCompletedEvent(String teiUid, String enrollmentUid) { + private static Event createValidCompletedEvent(String enrollmentUid) { Date refDate = getValidDate(); List values = Collections.singletonList(TrackedEntityDataValue.builder() .dataElement(validNumberDataElementUid) @@ -291,15 +291,15 @@ private static Event createValidCompletedEvent(String teiUid, String enrollmentU .created(refDate).lastUpdated(refDate).program(validProgramUid).programStage(validProgramStageUid) .organisationUnit(validOrgUnitUid).eventDate(refDate).status(EventStatus.COMPLETED).deleted(false) .trackedEntityDataValues(values).attributeOptionCombo(validCategoryComboOptionUid) - .trackedEntityInstance(teiUid).build(); + .build(); } - private static Event createFutureEvent(String teiUid, String enrollmentUid) { - return createEvent(teiUid, enrollmentUid, getFutureDate(), Collections.emptyList()); + private static Event createFutureEvent(String enrollmentUid) { + return createEvent(enrollmentUid, getFutureDate(), Collections.emptyList()); } - private static Event createEventWithInvalidDataElement(String teiUid, String enrollmentUid) { - return createEvent(teiUid, enrollmentUid, getValidDate(), + private static Event createEventWithInvalidDataElement(String enrollmentUid) { + return createEvent(enrollmentUid, getValidDate(), Collections.singletonList(TrackedEntityDataValue.builder() .dataElement("invalidUid") .value("value") @@ -307,8 +307,8 @@ private static Event createEventWithInvalidDataElement(String teiUid, String enr .build())); } - private static Event createEventWithValidAndInvalidDataValue(String teiUid, String enrollmentUid) { - return createEvent(teiUid, enrollmentUid, getValidDate(), + private static Event createEventWithValidAndInvalidDataValue(String enrollmentUid) { + return createEvent(enrollmentUid, getValidDate(), Arrays.asList( TrackedEntityDataValue.builder() .dataElement(validNumberDataElementUid) @@ -322,14 +322,14 @@ private static Event createEventWithValidAndInvalidDataValue(String teiUid, Stri .build())); } - private static Event createEvent(String teiUid, String enrollmentUid, Date refDate, + private static Event createEvent(String enrollmentUid, Date refDate, List values) { return Event.builder().uid(codeGenerator.generate()).enrollment(enrollmentUid) .created(refDate).lastUpdated(refDate).program(validProgramUid).programStage(validProgramStageUid) .organisationUnit(validOrgUnitUid).eventDate(refDate).status(EventStatus.ACTIVE).deleted(false) .trackedEntityDataValues(values).attributeOptionCombo(validCategoryComboOptionUid) - .trackedEntityInstance(teiUid).build(); + .build(); } private static Date getValidDate() { diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java index 6c5b32434a..962de2e0ed 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java @@ -40,6 +40,7 @@ import org.junit.runner.RunWith; import java.text.ParseException; +import java.util.Collections; import java.util.List; import androidx.test.runner.AndroidJUnit4; @@ -233,7 +234,7 @@ public void filter_by_attribute_option_combo() { public void filter_by_tracked_entity_instance() { List events = d2.eventModule().events - .byTrackedEntityInstaceUid().eq("nWrB0TfWlvh") + .byTrackedEntityInstanceUids(Collections.singletonList("nWrB0TfWlvh")) .get(); assertThat(events.size(), is(1)); From 6db60ad89286746bf31f108765abe39717274dd0 Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Thu, 30 May 2019 17:02:01 +0200 Subject: [PATCH 005/155] Removed unnecessary using of TEI field in event --- .../android/core/sms/data/LocalDbRepositoryImpl.java | 9 ++------- .../core/sms/domain/converter/TrackerEventConverter.java | 4 ++-- .../core/sms/domain/repository/LocalDbRepository.java | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java index 9930d3467c..63fcc3919d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java @@ -148,13 +148,8 @@ public Completable setMetadataIds(final Metadata metadata) { } @Override - public Single getTrackerEventToSubmit(String eventUid, String teiUid) { - return Single.fromCallable(() -> - eventModule.events.withTrackedEntityDataValues() - .byUid().eq(eventUid).one().get().toBuilder() - .trackedEntityInstance(teiUid) - .build() - ); + public Single getTrackerEventToSubmit(String eventUid) { + return getSimpleEventToSubmit(eventUid); // no difference at the moment } @Override diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java index bd182afa5a..f039353014 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/converter/TrackerEventConverter.java @@ -35,7 +35,7 @@ public Single convert(@NonNull Event e, String user, in subm.setEvent(e.uid()); subm.setProgramStage(e.programStage()); subm.setTimestamp(e.lastUpdated()); - subm.setTrackedEntityInstance(e.trackedEntityInstance()); + subm.setTrackedEntityInstance(teiUid); subm.setValues(convertDataValues(e.attributeOptionCombo(), e.trackedEntityDataValues())); subm.setOrgUnit(e.organisationUnit()); subm.setUserID(user); @@ -50,7 +50,7 @@ public Completable updateSubmissionState(State state) { @Override Single readItemFromDb() { - return getLocalDbRepository().getTrackerEventToSubmit(eventUid, teiUid); + return getLocalDbRepository().getTrackerEventToSubmit(eventUid); } @SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"}) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java index af95ab0da0..0be9e8689f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java @@ -30,7 +30,7 @@ public interface LocalDbRepository { Completable setMetadataIds(Metadata metadata); - Single getTrackerEventToSubmit(String eventUid, String teiUid); + Single getTrackerEventToSubmit(String eventUid); Single getSimpleEventToSubmit(String eventUid); From 5681880c7f91261e7fab0bb18cd23f178dfdf9f2 Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Thu, 30 May 2019 17:19:03 +0200 Subject: [PATCH 006/155] pmd updates --- .../dhis/android/core/sms/data/LocalDbRepositoryImpl.java | 7 +++++-- .../android/core/sms/domain/interactor/SmsSubmitCase.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java index 63fcc3919d..275e292cc6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java @@ -49,7 +49,7 @@ public class LocalDbRepositoryImpl implements LocalDbRepository { private static final String KEY_MODULE_ENABLED = "module_enabled"; private static final String KEY_SUBMISSIONS_IDS = "submissions_ids"; - private Collection ongoingSubmissionIds = null; + private Collection ongoingSubmissionIds; @Inject public LocalDbRepositoryImpl(Context ctx, @@ -232,7 +232,9 @@ public Single> getOngoingSubmissionsIds() { Set set = context.getSharedPreferences(CONFIG_FILE, Context.MODE_PRIVATE) .getStringSet(KEY_SUBMISSIONS_IDS, new HashSet<>()); HashSet numSet = new HashSet<>(); - if (set == null) return numSet; + if (set == null) { + return numSet; + } for (String val : set) { try { numSet.add(Integer.parseInt(val)); @@ -240,6 +242,7 @@ public Single> getOngoingSubmissionsIds() { Log.e(TAG, "Failed parsing submission id", e); } } + ongoingSubmissionIds = numSet; return numSet; } ); diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java index 79aa5529cc..6b2b32eb89 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java @@ -27,7 +27,7 @@ public class SmsSubmitCase { private Converter converter; private List smsParts; private Integer submissionId; - private boolean finishedSending = false; + private boolean finishedSending; public SmsSubmitCase(LocalDbRepository localDbRepository, SmsRepository smsRepository, DeviceStateRepository deviceStateRepository) { From c4083048cb540abd7fe22ac9b33440724c571aff Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Thu, 30 May 2019 18:06:33 +0200 Subject: [PATCH 007/155] Updated test --- .../android/core/sms/TestRepositories.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java b/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java index d15ce2c544..88464fe31f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java +++ b/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java @@ -38,6 +38,7 @@ import org.hisp.dhis.smscompression.models.Metadata; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -121,7 +122,12 @@ public Completable setMetadataIds(Metadata metadata) { } @Override - public Single getEventToSubmit(String eventUid, String teiUid) { + public Single getTrackerEventToSubmit(String eventUid) { + return null; + } + + @Override + public Single getSimpleEventToSubmit(String eventUid) { return null; } @@ -164,6 +170,21 @@ public Completable setModuleEnabled(boolean enabled) { public Single isModuleEnabled() { return Single.just(true); } + + @Override + public Single> getOngoingSubmissionsIds() { + return null; + } + + @Override + public Completable addOngoingSubmissionsId(Integer id) { + return null; + } + + @Override + public Completable removeOngoingSubmissionsId(Integer id) { + return null; + } } public static Enrollment getTestEnrollment(String enrollmentUid, String teiUid) { From dc8e28356a0ff51cffb18f9a0aa11d655970208f Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 12:17:51 +0200 Subject: [PATCH 008/155] [BUILD-WITH-REDUCED-TASKS] Build with reduced tasks --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f5b5533354..6c97ecaa46 100755 --- a/build.sh +++ b/build.sh @@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PROJECT_DIR=$DIR/ # This will: compile the project, run lint, run tests under JVM, package apk, check the code quality and run tests on the device/emulator. -"$PROJECT_DIR"/gradlew clean build --scan connectedAndroidTest \ No newline at end of file +"$PROJECT_DIR"/gradlew clean checkstyleDebug findbugsDebug pmdDebug lintDebug testDebug connectedDebugAndroidTest --scan \ No newline at end of file From 9faf71cfbfca5b1363616a7465e889e3e803695b Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Fri, 31 May 2019 15:32:39 +0200 Subject: [PATCH 009/155] Revert "[ANDROSDK-847] Revert "[ANDROSDK-848] Add datavaluesetsummary class"" This reverts commit be507598fe5a75e078bf1538ed1074e2991380a0. --- .../core/datavalue/DataSetValueSummary.java | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java new file mode 100644 index 0000000000..2ba32cdf41 --- /dev/null +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2004-2019, 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.datavalue; + +import android.database.Cursor; + +import androidx.annotation.NonNull; +import com.gabrielittner.auto.value.cursor.ColumnAdapter; +import com.google.auto.value.AutoValue; + +import org.hisp.dhis.android.core.common.State; +import org.hisp.dhis.android.core.data.database.DbStateColumnAdapter; + +@AutoValue +public abstract class DataSetValueSummary { + + @NonNull + public abstract String period(); + + @NonNull + public abstract String organisationUnit(); + + @NonNull + public abstract String attributeOptionCombo(); + + @NonNull + @ColumnAdapter(DbStateColumnAdapter.class) + public abstract State state(); + + @NonNull + public static DataSetValueSummary create(Cursor cursor) { + return AutoValue_DataSetValueSummary.createFromCursor(cursor); + } + + public abstract DataSetValueSummary.Builder toBuilder(); + + public static DataSetValueSummary.Builder builder() { + return new $AutoValue_DataSetValueSummary.Builder(); + } + + @AutoValue.Builder + public abstract static class Builder { + + public abstract Builder period(String period); + + public abstract Builder organisationUnit(String organisationUnit); + + public abstract Builder attributeOptionCombo(String attributeOptionCombo); + + public abstract Builder state(State state); + + public abstract DataSetValueSummary build(); + } +} From 7feb47cfe6f0fff78e68b77f9fcf7779c30e82c2 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 15:44:59 +0200 Subject: [PATCH 010/155] Add internal to most subpackages of arch --- .../PagingMockIntegrationShould.java | 2 +- .../dhis/android/core/common/D2Factory.java | 2 +- .../ConfigurationStoreIntegrationShould.java | 2 +- ...aObjectStoreAbstractIntegrationShould.java | 2 +- ...eObjectStoreAbstractIntegrationShould.java | 2 +- ...nkModelStoreAbstractIntegrationShould.java | 2 +- .../ObjectStoreAbstractIntegrationShould.java | 2 +- ...houtUidStoreAbstractIntegrationShould.java | 2 +- ...alueEndpointCallRealIntegrationShould.java | 4 +-- .../android/core/event/EventCallFactory.java | 2 +- .../core/event/api/EventAPIRealShould.java | 4 +-- ...nisationUnitCallMockIntegrationShould.java | 4 +-- .../SystemInfoCallMockIntegrationShould.java | 2 +- ...tityInstanceCallMockIntegrationShould.java | 2 +- ...InstancePostCallRealIntegrationShould.java | 2 +- .../api/BreakTheGlassAPIShould.java | 4 +-- .../api/TrackedEntityInstanceAPIShould.java | 4 +-- .../hisp/dhis/android/core/D2DIComponent.java | 2 +- .../APICallErrorCatcher.java | 2 +- .../APICallExecutor.java | 2 +- .../APICallExecutorImpl.java | 2 +- .../APIClientDIModule.java | 4 +-- .../APIErrorMapper.java | 2 +- .../APIExecutorsDIModule.java | 2 +- .../APIUrlProvider.java | 2 +- .../PreventURLDecodeInterceptor.java | 2 +- .../RxAPICallExecutor.java | 2 +- .../RxAPICallExecutorImpl.java | 4 +-- .../{ => internal}/CompletableProvider.java | 2 +- .../D2CallWithProgressImpl.java | 5 ++- .../{ => internal}/D2ProgressManager.java | 4 ++- .../internal}/CursorExecutor.java | 2 +- .../internal}/CursorExecutorImpl.java | 2 +- .../internal}/MultipleTableQueryBuilder.java | 2 +- .../internal}/OrderByClauseBuilder.java | 2 +- .../internal}/WhereClauseBuilder.java | 2 +- .../IdentifiableStatementBinder.java | 2 +- .../{ => internal}/LinkModelChildStore.java | 2 +- .../LinkModelChildStoreImpl.java | 5 ++- .../internal}/LinkTableChildProjection.java | 4 +-- .../internal}/NameableStatementBinder.java | 2 +- .../ObjectWithUidChildStore.java | 2 +- .../ObjectWithUidChildStoreImpl.java | 7 ++-- .../SingleParentChildProjection.java | 4 +-- .../SingleParentChildStore.java | 2 +- .../SingleParentChildStoreImpl.java | 7 ++-- .../internal}/StatementBinder.java | 2 +- .../internal}/WhereStatementBinder.java | 2 +- .../arch/db/{ => tableinfos}/TableInfo.java | 2 +- ...ableEntityFromDatabaseAdapterDIModule.java | 35 ------------------ ...yncHandlerFromDatabaseAdapterProvider.java | 36 ------------------- .../IdentifiableEntityDIModule.java | 2 +- .../IdentifiableStoreProvider.java | 2 +- .../ObjectWithoutUidEntityDIModule.java | 2 +- .../ObjectWithoutUidStoreProvider.java | 2 +- .../fields/{ => internal}/FieldsHelper.java | 2 +- .../IdentifiableDataSyncHandlerImpl.java | 2 +- .../ReadOnlyCollectionRepositoryImpl.java | 4 +-- .../filters/SubQueryFilterConnector.java | 2 +- ...FirstObjectWithDownloadRepositoryImpl.java | 2 +- .../ReadOnlyOneObjectRepositoryImpl.java | 2 +- .../paging/RepositoryDataSource.java | 4 +-- .../scope/WhereClauseFromScopeBuilder.java | 2 +- .../calls/factories/ListCallFactoryImpl.java | 2 +- .../calls/factories/QueryCallFactoryImpl.java | 2 +- .../calls/factories/UidsCallFactoryImpl.java | 2 +- .../fetchers/ListNoResourceCallFetcher.java | 2 +- ...NoResourceWithErrorCatcherCallFetcher.java | 4 +-- .../PayloadNoResourceCallFetcher.java | 2 +- .../fetchers/PayloadResourceCallFetcher.java | 2 +- .../fetchers/UidsNoResourceCallFetcher.java | 2 +- ...CategoryCategoryComboChildrenAppender.java | 2 +- .../CategoryCategoryComboLinkStore.java | 2 +- .../CategoryCategoryComboLinkTableInfo.java | 4 +-- ...ategoryCategoryOptionChildrenAppender.java | 2 +- .../CategoryCategoryOptionLinkStore.java | 2 +- .../CategoryCategoryOptionLinkTableInfo.java | 4 +-- .../CategoryComboEndpointCallFactory.java | 2 +- .../category/CategoryComboEntityDIModule.java | 2 +- .../core/category/CategoryComboFields.java | 2 +- .../core/category/CategoryComboStore.java | 4 +-- .../core/category/CategoryComboTableInfo.java | 2 +- .../category/CategoryComboUidsSeeker.java | 2 +- .../category/CategoryEndpointCallFactory.java | 2 +- .../core/category/CategoryEntityDIModule.java | 2 +- .../android/core/category/CategoryFields.java | 2 +- ...onComboCategoryOptionChildrenAppender.java | 2 +- ...oryOptionComboCategoryOptionLinkStore.java | 2 +- ...ptionComboCategoryOptionLinkTableInfo.java | 4 +-- .../category/CategoryOptionComboFields.java | 2 +- .../CategoryOptionComboStoreImpl.java | 6 ++-- .../CategoryOptionComboTableInfo.java | 2 +- .../CategoryOptionEntityDIModule.java | 2 +- .../core/category/CategoryOptionFields.java | 2 +- .../core/category/CategoryOptionStore.java | 4 +-- .../category/CategoryOptionTableInfo.java | 2 +- .../android/core/category/CategoryStore.java | 4 +-- .../core/category/CategoryTableInfo.java | 2 +- .../common/IdentifiableObjectStoreImpl.java | 2 +- .../IdentifiableObjectWithStateStoreImpl.java | 4 +-- .../core/common/LinkModelStoreImpl.java | 2 +- .../android/core/common/ObjectStoreImpl.java | 2 +- .../common/ObjectStyleChildrenAppender.java | 2 +- .../common/ObjectStyleEntityDIModule.java | 2 +- .../core/common/ObjectStyleFields.java | 2 +- .../core/common/ObjectStyleHandlerImpl.java | 2 +- .../android/core/common/ObjectStyleStore.java | 2 +- .../core/common/ObjectStyleStoreImpl.java | 8 ++--- .../core/common/ObjectStyleTableInfo.java | 2 +- .../common/ObjectWithoutUidStoreImpl.java | 4 +-- .../core/common/SQLStatementBuilder.java | 6 ++-- .../android/core/common/StoreFactory.java | 24 ++++++------- .../common/ValueTypeDeviceRenderingStore.java | 4 +-- .../ValueTypeDeviceRenderingTableInfo.java | 2 +- .../configuration/ConfigurationStoreImpl.java | 2 +- .../configuration/ConfigurationTableInfo.java | 2 +- .../core/constant/ConstantCallFactory.java | 2 +- .../android/core/constant/ConstantFields.java | 2 +- .../android/core/constant/ConstantStore.java | 4 +-- .../core/constant/ConstantTableInfo.java | 2 +- .../core/d2manager/OkHttpClientFactory.java | 2 +- .../dataapproval/DataApprovalCallFactory.java | 2 +- .../DataApprovalEntityDIModule.java | 2 +- .../core/dataapproval/DataApprovalFields.java | 2 +- .../core/dataapproval/DataApprovalStore.java | 4 +-- .../dataapproval/DataApprovalTableInfo.java | 2 +- .../DataElementEndpointCallFactory.java | 2 +- .../core/dataelement/DataElementFields.java | 2 +- .../dataelement/DataElementOperandFields.java | 2 +- .../dataelement/DataElementOperandStore.java | 2 +- .../DataElementOperandTableInfo.java | 2 +- .../core/dataelement/DataElementStore.java | 4 +-- .../dataelement/DataElementTableInfo.java | 2 +- .../DataInputPeriodChildrenAppender.java | 2 +- .../core/dataset/DataInputPeriodFields.java | 2 +- .../dataset/DataInputPeriodLinkStore.java | 4 +-- .../dataset/DataInputPeriodTableInfo.java | 2 +- ...ataSetCompleteRegistrationCallFactory.java | 2 +- ...ataSetCompleteRegistrationCallFetcher.java | 2 +- ...SetCompleteRegistrationEntityDIModule.java | 2 +- .../DataSetCompleteRegistrationFields.java | 2 +- .../DataSetCompleteRegistrationPostCall.java | 2 +- .../DataSetCompleteRegistrationStoreImpl.java | 6 ++-- .../DataSetCompleteRegistrationTableInfo.java | 2 +- ...oryDataElementOperandChildrenAppender.java | 2 +- ...CompulsoryDataElementOperandLinkStore.java | 2 +- ...ulsoryDataElementOperandLinkTableInfo.java | 4 +-- .../dataset/DataSetDataElementLinkStore.java | 2 +- .../DataSetDataElementLinkTableInfo.java | 2 +- .../DataSetElementChildrenAppender.java | 2 +- .../core/dataset/DataSetElementFields.java | 2 +- .../dataset/DataSetElementLinkTableInfo.java | 4 +-- .../dataset/DataSetEndpointCallFactory.java | 2 +- .../android/core/dataset/DataSetFields.java | 2 +- .../DataSetOrganisationUnitLinkStore.java | 2 +- .../DataSetOrganisationUnitLinkTableInfo.java | 4 +-- .../android/core/dataset/DataSetStore.java | 4 +-- .../core/dataset/DataSetTableInfo.java | 2 +- .../core/dataset/SectionChildrenAppender.java | 2 +- .../SectionDataElementChildrenAppender.java | 2 +- .../dataset/SectionDataElementLinkStore.java | 2 +- .../SectionDataElementLinkTableInfo.java | 4 +-- .../android/core/dataset/SectionFields.java | 2 +- .../SectionGreyedFieldsChildrenAppender.java | 2 +- .../dataset/SectionGreyedFieldsLinkStore.java | 2 +- .../SectionGreyedFieldsLinkTableInfo.java | 4 +-- .../android/core/dataset/SectionStore.java | 6 ++-- .../core/dataset/SectionTableInfo.java | 2 +- .../DataValueEndpointCallFactory.java | 2 +- .../core/datavalue/DataValueFields.java | 2 +- .../core/datavalue/DataValuePostCall.java | 2 +- .../core/datavalue/DataValueStore.java | 6 ++-- .../core/datavalue/DataValueTableInfo.java | 2 +- .../aggregated/data/AggregatedDataCall.java | 4 +-- .../EnrollmentChildrenAppender.java | 2 +- .../core/enrollment/EnrollmentFields.java | 2 +- .../enrollment/EnrollmentImportHandler.java | 2 +- .../core/enrollment/EnrollmentStoreImpl.java | 6 ++-- .../core/enrollment/EnrollmentTableInfo.java | 2 +- .../enrollment/note/NoteChildrenAppender.java | 2 +- .../core/enrollment/note/NoteFields.java | 2 +- .../core/enrollment/note/NoteStore.java | 6 ++-- .../core/enrollment/note/NoteTableInfo.java | 2 +- .../note/NoteUniquenessManager.java | 2 +- .../core/event/EventChildrenAppender.java | 2 +- .../core/event/EventEndpointCallFactory.java | 2 +- .../dhis/android/core/event/EventFields.java | 2 +- .../core/event/EventImportHandler.java | 2 +- .../android/core/event/EventPostCall.java | 2 +- .../android/core/event/EventStoreImpl.java | 6 ++-- .../android/core/event/EventTableInfo.java | 2 +- .../imports/TrackerImportConflictStore.java | 2 +- .../TrackerImportConflictTableInfo.java | 2 +- .../DataSetIndicatorChildrenAppender.java | 2 +- .../indicator/DataSetIndicatorLinkStore.java | 2 +- .../DataSetIndicatorLinkTableInfo.java | 4 +-- .../IndicatorEndpointCallFactory.java | 2 +- .../indicator/IndicatorEntityDIModule.java | 2 +- .../core/indicator/IndicatorFields.java | 2 +- .../core/indicator/IndicatorStore.java | 4 +-- .../core/indicator/IndicatorTableInfo.java | 2 +- .../IndicatorTypeEndpointCallFactory.java | 2 +- .../IndicatorTypeEntityDIModule.java | 2 +- .../core/indicator/IndicatorTypeFields.java | 2 +- .../core/indicator/IndicatorTypeStore.java | 4 +-- .../indicator/IndicatorTypeTableInfo.java | 2 +- .../legendset/LegendChildrenAppender.java | 2 +- .../android/core/legendset/LegendFields.java | 2 +- .../core/legendset/LegendSetFields.java | 2 +- .../core/legendset/LegendSetStore.java | 4 +-- .../core/legendset/LegendSetTableInfo.java | 2 +- .../android/core/legendset/LegendStore.java | 6 ++-- .../core/legendset/LegendTableInfo.java | 2 +- .../ProgramIndicatorLegendSetLinkStore.java | 2 +- ...rogramIndicatorLegendSetLinkTableInfo.java | 4 +-- .../core/maintenance/D2ErrorStore.java | 2 +- .../core/maintenance/D2ErrorTableInfo.java | 2 +- .../maintenance/ForeignKeyViolationStore.java | 2 +- .../ForeignKeyViolationTableInfo.java | 2 +- .../android/core/option/OptionFields.java | 2 +- .../core/option/OptionGroupCallFactory.java | 2 +- .../core/option/OptionGroupFields.java | 2 +- .../OptionGroupOptionChildrenAppender.java | 2 +- .../option/OptionGroupOptionLinkStore.java | 2 +- .../OptionGroupOptionLinkTableInfo.java | 4 +-- .../android/core/option/OptionGroupStore.java | 4 +-- .../core/option/OptionGroupTableInfo.java | 2 +- .../core/option/OptionSetCallFactory.java | 2 +- .../android/core/option/OptionSetFields.java | 2 +- .../OptionSetOptionChildrenAppender.java | 2 +- .../android/core/option/OptionSetStore.java | 4 +-- .../core/option/OptionSetTableInfo.java | 2 +- .../dhis/android/core/option/OptionStore.java | 6 ++-- .../android/core/option/OptionTableInfo.java | 2 +- .../OrganisationUnitCallFactory.java | 2 +- ...ganisationUnitDataSetChildrenAppender.java | 2 +- .../OrganisationUnitEntityDIModule.java | 2 +- .../OrganisationUnitFields.java | 2 +- .../OrganisationUnitGroupEntityDIModule.java | 2 +- .../OrganisationUnitGroupFields.java | 2 +- .../OrganisationUnitGroupStore.java | 4 +-- .../OrganisationUnitGroupTableInfo.java | 2 +- ...anisationUnitLevelEndpointCallFactory.java | 2 +- .../OrganisationUnitLevelEntityDIModule.java | 2 +- .../OrganisationUnitLevelFields.java | 2 +- .../OrganisationUnitLevelStore.java | 4 +-- .../OrganisationUnitLevelTableInfo.java | 2 +- ...ionUnitOrganisationUnitGroupLinkStore.java | 2 +- ...nitOrganisationUnitGroupLinkTableInfo.java | 4 +-- ...ationUnitGroupProgramChildrenAppender.java | 2 +- ...ganisationUnitProgramChildrenAppender.java | 2 +- .../OrganisationUnitProgramLinkStore.java | 2 +- .../OrganisationUnitProgramLinkTableInfo.java | 4 +-- .../OrganisationUnitStore.java | 4 +-- .../OrganisationUnitTableInfo.java | 2 +- ...chOrganisationUnitOnDemandCallFactory.java | 2 +- .../core/period/InPeriodQueryHelper.java | 2 +- .../android/core/period/PeriodStoreImpl.java | 6 ++-- .../android/core/period/PeriodTableInfo.java | 2 +- .../program/ProgramEndpointCallFactory.java | 2 +- .../android/core/program/ProgramFields.java | 2 +- .../ProgramIndicatorChildrenAppender.java | 2 +- .../core/program/ProgramIndicatorFields.java | 2 +- ...ramIndicatorLegendSetChildrenAppender.java | 2 +- .../core/program/ProgramIndicatorStore.java | 6 ++-- .../program/ProgramIndicatorTableInfo.java | 2 +- .../ProgramRuleActionChildrenAppender.java | 2 +- .../core/program/ProgramRuleActionFields.java | 2 +- .../core/program/ProgramRuleActionStore.java | 6 ++-- .../program/ProgramRuleActionTableInfo.java | 2 +- .../program/ProgramRuleChildrenAppender.java | 2 +- .../ProgramRuleEndpointCallFactory.java | 2 +- .../core/program/ProgramRuleFields.java | 2 +- .../core/program/ProgramRuleStore.java | 6 ++-- .../core/program/ProgramRuleTableInfo.java | 2 +- .../ProgramRuleVariableChildrenAppender.java | 2 +- .../program/ProgramRuleVariableFields.java | 2 +- .../program/ProgramRuleVariableStore.java | 6 ++-- .../program/ProgramRuleVariableTableInfo.java | 2 +- ...ogramSectionAttributeChildrenAppender.java | 2 +- .../ProgramSectionAttributeLinkStore.java | 2 +- .../ProgramSectionAttributeLinkTableInfo.java | 4 +-- .../ProgramSectionChildrenAppender.java | 2 +- .../core/program/ProgramSectionFields.java | 2 +- .../core/program/ProgramSectionStore.java | 6 ++-- .../core/program/ProgramSectionTableInfo.java | 2 +- .../program/ProgramStageChildrenAppender.java | 2 +- ...ogramStageDataElementChildrenAppender.java | 2 +- .../ProgramStageDataElementFields.java | 2 +- .../program/ProgramStageDataElementStore.java | 4 +-- .../ProgramStageDataElementTableInfo.java | 4 +-- .../ProgramStageEndpointCallFactory.java | 2 +- .../program/ProgramStageEntityDIModule.java | 2 +- .../core/program/ProgramStageFields.java | 2 +- .../ProgramStageSectionChildrenAppender.java | 2 +- ...ageSectionDataElementChildrenAppender.java | 2 +- ...ogramStageSectionDataElementLinkStore.java | 2 +- ...mStageSectionDataElementLinkTableInfo.java | 4 +-- .../program/ProgramStageSectionFields.java | 2 +- ...ctionProgramIndicatorChildrenAppender.java | 2 +- ...StageSectionProgramIndicatorLinkStore.java | 2 +- ...eSectionProgramIndicatorLinkTableInfo.java | 4 +-- .../program/ProgramStageSectionStore.java | 6 ++-- .../program/ProgramStageSectionTableInfo.java | 2 +- .../core/program/ProgramStageStore.java | 6 ++-- .../core/program/ProgramStageTableInfo.java | 2 +- .../android/core/program/ProgramStore.java | 6 ++-- .../core/program/ProgramTableInfo.java | 2 +- ...rackedEntityAttributeChildrenAppender.java | 2 +- .../ProgramTrackedEntityAttributeFields.java | 2 +- .../ProgramTrackedEntityAttributeStore.java | 6 ++-- ...rogramTrackedEntityAttributeTableInfo.java | 2 +- .../RelationshipConstraintFields.java | 2 +- .../RelationshipConstraintStore.java | 4 +-- .../RelationshipConstraintTableInfo.java | 2 +- .../core/relationship/RelationshipFields.java | 2 +- .../relationship/RelationshipItemFields.java | 2 +- .../RelationshipItemStoreImpl.java | 6 ++-- .../RelationshipItemTableInfo.java | 2 +- .../relationship/RelationshipStoreImpl.java | 4 +-- .../relationship/RelationshipTableInfo.java | 2 +- .../RelationshipTypeEndpointCallFactory.java | 2 +- .../relationship/RelationshipTypeFields.java | 2 +- .../relationship/RelationshipTypeStore.java | 4 +-- .../RelationshipTypeTableInfo.java | 2 +- .../core/resource/ResourceStoreImpl.java | 6 ++-- .../core/resource/ResourceTableInfo.java | 2 +- .../core/settings/SystemSettingCall.java | 2 +- .../settings/SystemSettingEntityDIModule.java | 2 +- .../core/settings/SystemSettingStore.java | 4 +-- .../core/settings/SystemSettingTableInfo.java | 2 +- .../core/settings/SystemSettingsFields.java | 2 +- .../core/systeminfo/SystemInfoCall.java | 4 +-- .../systeminfo/SystemInfoEntityDIModule.java | 2 +- .../core/systeminfo/SystemInfoFields.java | 2 +- .../core/systeminfo/SystemInfoStore.java | 4 +-- .../core/systeminfo/SystemInfoTableInfo.java | 2 +- .../TrackedEntityAttributeFields.java | 2 +- ...ttributeReservedValueCallErrorCatcher.java | 2 +- ...ibuteReservedValueEndpointCallFactory.java | 2 +- ...edEntityAttributeReservedValueManager.java | 2 +- ...ckedEntityAttributeReservedValueStore.java | 6 ++-- ...EntityAttributeReservedValueTableInfo.java | 2 +- .../TrackedEntityAttributeStore.java | 4 +-- .../TrackedEntityAttributeTableInfo.java | 2 +- ...dEntityAttributeValueChildrenAppender.java | 2 +- .../TrackedEntityAttributeValueFields.java | 2 +- .../TrackedEntityAttributeValueStoreImpl.java | 8 ++--- .../TrackedEntityAttributeValueTableInfo.java | 2 +- ...rackedEntityDataValueChildrenAppender.java | 2 +- .../TrackedEntityDataValueFields.java | 2 +- .../TrackedEntityDataValueStoreImpl.java | 8 ++--- .../TrackedEntityDataValueTableInfo.java | 2 +- ...TrackedEntityInstanceCallErrorCatcher.java | 2 +- .../TrackedEntityInstanceFields.java | 2 +- .../TrackedEntityInstanceImportHandler.java | 2 +- ...anceListDownloadAndPersistCallFactory.java | 2 +- .../TrackedEntityInstancePostCall.java | 4 +-- .../TrackedEntityInstanceStoreImpl.java | 4 +-- .../TrackedEntityInstanceTableInfo.java | 2 +- ...kedEntityInstanceWithLimitCallFactory.java | 6 ++-- ...edEntityTypeAttributeChildrenAppender.java | 2 +- .../TrackedEntityTypeAttributeFields.java | 2 +- .../TrackedEntityTypeAttributeStore.java | 4 +-- .../TrackedEntityTypeAttributeTableInfo.java | 2 +- .../TrackedEntityTypeCallFactory.java | 2 +- .../TrackedEntityTypeEntityDIModule.java | 2 +- .../TrackedEntityTypeFields.java | 2 +- .../trackedentity/TrackedEntityTypeStore.java | 4 +-- .../TrackedEntityTypeTableInfo.java | 2 +- ...TrackedEntityInstanceLocalQueryHelper.java | 2 +- ...TrackedEntityInstanceQueryCallFactory.java | 2 +- .../user/AuthenticatedUserEntityDIModule.java | 2 +- .../core/user/AuthenticatedUserStore.java | 4 +-- .../core/user/AuthenticatedUserTableInfo.java | 2 +- .../core/user/AuthorityCallFetcher.java | 2 +- .../user/AuthorityEndpointCallFactory.java | 2 +- .../core/user/AuthorityEntityDIModule.java | 2 +- .../android/core/user/AuthorityStore.java | 4 +-- .../android/core/user/AuthorityTableInfo.java | 2 +- .../UserAuthenticateCallErrorCatcher.java | 2 +- .../user/UserAuthenticateCallFactory.java | 4 +-- .../hisp/dhis/android/core/user/UserCall.java | 2 +- .../core/user/UserCredentialsFields.java | 2 +- .../core/user/UserCredentialsStoreImpl.java | 6 ++-- .../core/user/UserCredentialsTableInfo.java | 2 +- .../android/core/user/UserEntityDIModule.java | 2 +- .../UserOrganisationUnitChildrenAppender.java | 4 +-- .../UserOrganisationUnitLinkStoreImpl.java | 2 +- .../UserOrganisationUnitLinkTableInfo.java | 4 +-- .../core/user/UserRoleEntityDIModule.java | 2 +- .../android/core/user/UserRoleFields.java | 2 +- .../dhis/android/core/user/UserRoleStore.java | 4 +-- .../android/core/user/UserRoleTableInfo.java | 2 +- .../dhis/android/core/user/UserStore.java | 4 +-- .../dhis/android/core/user/UserTableInfo.java | 2 +- .../dhis/android/core/wipe/TableWiper.java | 2 +- .../APICallExecutorShould.java | 2 +- .../db/MultipleTableQueryBuilderShould.java | 1 + .../arch/db/WhereClauseBuilderShould.java | 1 + .../WhereClauseFromScopeBuilderShould.java | 2 +- .../common/SQLStatementBuilderShould.java | 2 +- .../core/data/api/RetrofitFactory.java | 2 +- .../core/event/EventEndpointCallShould.java | 2 +- .../OrganisationUnitCallUnitShould.java | 2 +- .../program/ProgramEndpointCallShould.java | 4 +-- .../core/systeminfo/SystemInfoCallShould.java | 2 +- .../TrackedEntityInstanceQueryCallShould.java | 2 +- .../user/AuthorityEndpointCallShould.java | 4 +-- .../user/UserAuthenticateCallUnitShould.java | 6 ++-- .../android/core/user/UserCallShould.java | 2 +- 411 files changed, 561 insertions(+), 628 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/APICallErrorCatcher.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/APICallExecutor.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/APICallExecutorImpl.java (99%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{retrofit => internal}/APIClientDIModule.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/APIErrorMapper.java (99%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/APIExecutorsDIModule.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{retrofit => internal}/APIUrlProvider.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{retrofit => internal}/PreventURLDecodeInterceptor.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/RxAPICallExecutor.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/RxAPICallExecutorImpl.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/call/{ => internal}/CompletableProvider.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/call/{ => internal}/D2CallWithProgressImpl.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/call/{ => internal}/D2ProgressManager.java (95%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{executors => cursors/internal}/CursorExecutor.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{executors => cursors/internal}/CursorExecutorImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{ => querybuilders/internal}/MultipleTableQueryBuilder.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{ => querybuilders/internal}/OrderByClauseBuilder.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{ => querybuilders/internal}/WhereClauseBuilder.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{binders => stores/internal}/IdentifiableStatementBinder.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => internal}/LinkModelChildStore.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => internal}/LinkModelChildStoreImpl.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{tableinfos => stores/internal}/LinkTableChildProjection.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{binders => stores/internal}/NameableStatementBinder.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => internal}/ObjectWithUidChildStore.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => internal}/ObjectWithUidChildStoreImpl.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{tableinfos => stores/internal}/SingleParentChildProjection.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => internal}/SingleParentChildStore.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => internal}/SingleParentChildStoreImpl.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{binders => stores/internal}/StatementBinder.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{binders => stores/internal}/WhereStatementBinder.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/{ => tableinfos}/TableInfo.java (97%) delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityFromDatabaseAdapterDIModule.java delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/di/SyncHandlerFromDatabaseAdapterProvider.java rename core/src/main/java/org/hisp/dhis/android/core/arch/di/{ => internal}/IdentifiableEntityDIModule.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/di/{ => internal}/IdentifiableStoreProvider.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/di/{ => internal}/ObjectWithoutUidEntityDIModule.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/di/{ => internal}/ObjectWithoutUidStoreProvider.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/fields/{ => internal}/FieldsHelper.java (98%) rename core/src/test/java/org/hisp/dhis/android/core/arch/api/{executors => internal}/APICallExecutorShould.java (99%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java index c7a825f3a0..8bb732f6d6 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java @@ -30,7 +30,7 @@ import com.jraska.livedata.TestObserver; -import org.hisp.dhis.android.core.arch.db.OrderByClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.category.CategoryOption; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/D2Factory.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/D2Factory.java index ed07979e53..0235845e1b 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/D2Factory.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/D2Factory.java @@ -33,7 +33,7 @@ import com.facebook.stetho.okhttp3.StethoInterceptor; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.api.retrofit.PreventURLDecodeInterceptor; +import org.hisp.dhis.android.core.arch.api.internal.PreventURLDecodeInterceptor; import org.hisp.dhis.android.core.configuration.Configuration; import org.hisp.dhis.android.core.d2manager.D2Configuration; import org.hisp.dhis.android.core.d2manager.D2Manager; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreIntegrationShould.java index 0b97bcc42b..e23456ba75 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.configuration; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.data.configuration.ConfigurationSamples; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.utils.integration.mock.DatabaseAdapterFactory; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java index aa1a962692..a59132126b 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.data.database; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.DataModel; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java index 4f98d5354f..a4c69b0403 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.data.database; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java index eb01914e52..b52d859568 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.data.database; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.Model; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java index fc60130fd7..aa9eaff7b5 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java @@ -30,7 +30,7 @@ import android.content.ContentValues; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java index 68d6bef916..981f5e291c 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.data.database; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java index a268b7a7f4..47dcd40ceb 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.D2Factory; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventCallFactory.java b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventCallFactory.java index 1cd7399724..3bf0ee628a 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventCallFactory.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/api/EventAPIRealShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/event/api/EventAPIRealShould.java index 6342eb6d65..4ecf3bc7b1 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/api/EventAPIRealShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/api/EventAPIRealShould.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.event.api; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.RealServerMother; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java index 979e26415b..938d9b5219 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java @@ -33,8 +33,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java index 496aa49e7b..11ee6c8f8d 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.data.systeminfo.SystemInfoSamples; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallMockIntegrationShould.java index cd37db7b63..c336933e48 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallMockIntegrationShould.java @@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java index ccd74058e5..ad3927d16a 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallRealIntegrationShould.java @@ -31,7 +31,7 @@ import com.google.common.collect.Lists; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.Coordinates; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java index 1e4b6844d4..801aef5526 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity.api; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.RealServerMother; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.java index 79d336e9bb..7b2ee11219 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.java @@ -31,8 +31,8 @@ import junit.framework.Assert; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java index 03959ea295..e80b643226 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java +++ b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java @@ -30,7 +30,7 @@ import android.content.Context; -import org.hisp.dhis.android.core.arch.api.retrofit.APIClientDIModule; +import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.di.RepositoriesDIModule; import org.hisp.dhis.android.core.calls.MetadataCall; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallErrorCatcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallErrorCatcher.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallErrorCatcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallErrorCatcher.java index 2a4bc14dfd..a50b2a61da 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallErrorCatcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallErrorCatcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutor.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutor.java index 639add56de..9667418ffb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutor.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java similarity index 99% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutorImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java index 4cc56ed854..3190c2b56b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.ObjectMapperFactory; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/APIClientDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/APIClientDIModule.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java index 98bd31dfc8..e385034047 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/APIClientDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java @@ -26,9 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.retrofit; +package org.hisp.dhis.android.core.arch.api.internal; -import org.hisp.dhis.android.core.arch.api.executors.APIExecutorsDIModule; +import org.hisp.dhis.android.core.arch.api.internal.APIExecutorsDIModule; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APIErrorMapper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIErrorMapper.java similarity index 99% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APIErrorMapper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIErrorMapper.java index aef7433a0c..d4ec5adf51 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APIErrorMapper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIErrorMapper.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import android.util.Log; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APIExecutorsDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIExecutorsDIModule.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APIExecutorsDIModule.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIExecutorsDIModule.java index 015b91777c..706ac77006 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/APIExecutorsDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIExecutorsDIModule.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/APIUrlProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIUrlProvider.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/APIUrlProvider.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIUrlProvider.java index 6bae693256..37bcb9faef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/APIUrlProvider.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIUrlProvider.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.retrofit; +package org.hisp.dhis.android.core.arch.api.internal; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/PreventURLDecodeInterceptor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/PreventURLDecodeInterceptor.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/PreventURLDecodeInterceptor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/PreventURLDecodeInterceptor.java index 08bd0b5a0c..088dc5fc52 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/retrofit/PreventURLDecodeInterceptor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/PreventURLDecodeInterceptor.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.retrofit; +package org.hisp.dhis.android.core.arch.api.internal; import java.io.IOException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/RxAPICallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutor.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/RxAPICallExecutor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutor.java index eb99e8fb53..f3bb1a8b9b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/RxAPICallExecutor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutor.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; import org.hisp.dhis.android.core.arch.call.D2Progress; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/RxAPICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/RxAPICallExecutorImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java index 21766a725b..79e035084b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/RxAPICallExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; -import org.hisp.dhis.android.core.arch.call.D2CallWithProgressImpl; +import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/CompletableProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/CompletableProvider.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.java index eba364199c..eceffc637e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/CompletableProvider.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.call; +package org.hisp.dhis.android.core.arch.call.internal; import io.reactivex.Completable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2CallWithProgressImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/D2CallWithProgressImpl.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/D2CallWithProgressImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/D2CallWithProgressImpl.java index 7ae735f998..7b7c070646 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2CallWithProgressImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/D2CallWithProgressImpl.java @@ -26,7 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.call; +package org.hisp.dhis.android.core.arch.call.internal; + +import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; +import org.hisp.dhis.android.core.arch.call.D2Progress; import io.reactivex.Observable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressManager.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/D2ProgressManager.java similarity index 95% rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressManager.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/D2ProgressManager.java index 92880b4f0d..11f8cf704e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/D2ProgressManager.java @@ -26,7 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.call; +package org.hisp.dhis.android.core.arch.call.internal; + +import org.hisp.dhis.android.core.arch.call.D2Progress; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/executors/CursorExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutor.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/executors/CursorExecutor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutor.java index 7daec47480..629614c94b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/executors/CursorExecutor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutor.java @@ -25,7 +25,7 @@ * (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.arch.db.executors; +package org.hisp.dhis.android.core.arch.db.cursors.internal; import android.database.Cursor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/executors/CursorExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/executors/CursorExecutorImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java index a9a2d7ff6c..23e0cd70b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/executors/CursorExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java @@ -25,7 +25,7 @@ * (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.arch.db.executors; +package org.hisp.dhis.android.core.arch.db.cursors.internal; import android.database.Cursor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/MultipleTableQueryBuilder.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/MultipleTableQueryBuilder.java index b4e481f8d4..d467638a62 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/MultipleTableQueryBuilder.java @@ -25,7 +25,7 @@ * (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.arch.db; +package org.hisp.dhis.android.core.arch.db.querybuilders.internal; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/OrderByClauseBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/OrderByClauseBuilder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java index 5a46ffeaa0..406ad91cac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/OrderByClauseBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java @@ -25,7 +25,7 @@ * (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.arch.db; +package org.hisp.dhis.android.core.arch.db.querybuilders.internal; import android.content.ContentValues; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/WhereClauseBuilder.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/WhereClauseBuilder.java index 1be83df984..a4de1de0e7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/WhereClauseBuilder.java @@ -25,7 +25,7 @@ * (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.arch.db; +package org.hisp.dhis.android.core.arch.db.querybuilders.internal; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/IdentifiableStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableStatementBinder.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/IdentifiableStatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableStatementBinder.java index 8c8860735a..e123cfbe50 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/IdentifiableStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableStatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.binders; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/LinkModelChildStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStore.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/LinkModelChildStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStore.java index c6c1e44b64..3619a137b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/LinkModelChildStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStore.java @@ -25,7 +25,7 @@ * (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.arch.db.stores; +package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/LinkModelChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/LinkModelChildStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java index a27bbcd6c2..66a8beea34 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/LinkModelChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java @@ -25,10 +25,9 @@ * (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.arch.db.stores; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.arch.db.executors.CursorExecutor; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutor; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/LinkTableChildProjection.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkTableChildProjection.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/LinkTableChildProjection.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkTableChildProjection.java index 7f4f5f2b75..8e58ebb6aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/LinkTableChildProjection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkTableChildProjection.java @@ -25,9 +25,9 @@ * (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.arch.db.tableinfos; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; public class LinkTableChildProjection { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/NameableStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/NameableStatementBinder.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/NameableStatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/NameableStatementBinder.java index 8471e6c173..a83d12d25e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/NameableStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/NameableStatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.binders; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/ObjectWithUidChildStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStore.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/ObjectWithUidChildStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStore.java index f782039be1..b76a31c5ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/ObjectWithUidChildStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStore.java @@ -25,7 +25,7 @@ * (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.arch.db.stores; +package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/ObjectWithUidChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/ObjectWithUidChildStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java index 2a9085336a..3ed821caa6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/ObjectWithUidChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java @@ -25,11 +25,10 @@ * (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.arch.db.stores; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.executors.CursorExecutorImpl; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/SingleParentChildProjection.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildProjection.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/SingleParentChildProjection.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildProjection.java index 4d13bd8993..bb0e91218b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/SingleParentChildProjection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildProjection.java @@ -25,9 +25,9 @@ * (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.arch.db.tableinfos; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; public class SingleParentChildProjection { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/SingleParentChildStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStore.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/SingleParentChildStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStore.java index 16f7671362..4089faacc2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/SingleParentChildStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStore.java @@ -25,7 +25,7 @@ * (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.arch.db.stores; +package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/SingleParentChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/SingleParentChildStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java index 3fea0d1586..60ab973f7d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/SingleParentChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java @@ -25,11 +25,10 @@ * (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.arch.db.stores; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.executors.CursorExecutor; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutor; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/StatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StatementBinder.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/StatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StatementBinder.java index 83c478af88..bb94690e17 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/StatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.binders; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/WhereStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/WhereStatementBinder.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/WhereStatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/WhereStatementBinder.java index bba472a264..c312827297 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/binders/WhereStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/WhereStatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.binders; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.sqlite.SQLiteStatement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/TableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/TableInfo.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/TableInfo.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/TableInfo.java index 8f0ae660ef..95e6605ed8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/TableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/tableinfos/TableInfo.java @@ -25,7 +25,7 @@ * (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.arch.db; +package org.hisp.dhis.android.core.arch.db.tableinfos; import org.hisp.dhis.android.core.common.BaseModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityFromDatabaseAdapterDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityFromDatabaseAdapterDIModule.java deleted file mode 100644 index 0b83330c0d..0000000000 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityFromDatabaseAdapterDIModule.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004-2019, 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.arch.di; - -import org.hisp.dhis.android.core.common.ObjectWithUidInterface; - -public interface IdentifiableEntityFromDatabaseAdapterDIModule - extends IdentifiableStoreProvider, SyncHandlerFromDatabaseAdapterProvider { -} \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/SyncHandlerFromDatabaseAdapterProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/SyncHandlerFromDatabaseAdapterProvider.java deleted file mode 100644 index 726876c7cc..0000000000 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/SyncHandlerFromDatabaseAdapterProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2004-2019, 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.arch.di; - -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.data.database.DatabaseAdapter; - -interface SyncHandlerFromDatabaseAdapterProvider { - SyncHandler handler(DatabaseAdapter databaseAdapter); -} \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityDIModule.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java index 50925d41ae..960e3b80eb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.di; +package org.hisp.dhis.android.core.arch.di.internal; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableStoreProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableStoreProvider.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java index 2770e2d828..cb304ca0c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/IdentifiableStoreProvider.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.di; +package org.hisp.dhis.android.core.arch.di.internal; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/ObjectWithoutUidEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/ObjectWithoutUidEntityDIModule.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java index 178891df5c..49f4f68816 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/ObjectWithoutUidEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.di; +package org.hisp.dhis.android.core.arch.di.internal; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/ObjectWithoutUidStoreProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/ObjectWithoutUidStoreProvider.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java index f3865ddb9f..697c22c165 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/ObjectWithoutUidStoreProvider.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.di; +package org.hisp.dhis.android.core.arch.di.internal; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/fields/FieldsHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/fields/FieldsHelper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.java index 4c16f08168..b9805db5f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/fields/FieldsHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.fields; +package org.hisp.dhis.android.core.arch.fields.internal; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.BaseNameableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java index 342d67842a..5df0c8fcd7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.handlers; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.DataModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java index 19df092ed1..aa6204cd38 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.db.OrderByClauseBuilder; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java index 868d16c9cc..f9978ddc0d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index e802bc0fdf..a6af391934 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.object; -import org.hisp.dhis.android.core.arch.call.CompletableProvider; +import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java index 65fc90c980..95e82e170b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.object; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.WhereClauseFromScopeBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java index fa6c1bca82..d79d491950 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.arch.repositories.paging; -import org.hisp.dhis.android.core.arch.db.OrderByClauseBuilder; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java index ebbbed4f6d..241e7a4ce6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.scope; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; public class WhereClauseFromScopeBuilder { diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java index 7a82013870..2af656c657 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.factories; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java index 5de97ec914..1152f9cc1c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.factories; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java index abeff9266f..1076338bf4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.factories; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java index 884753c389..16cc4cce58 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.fetchers; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.maintenance.D2Error; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java index 822e47e9d9..219d17fe53 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.calls.fetchers; -import org.hisp.dhis.android.core.arch.api.executors.APICallErrorCatcher; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.maintenance.D2Error; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java index 3982d100ae..3bd0483570 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.fetchers; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java index f640985d9a..cadb5c1eaa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.fetchers; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java index 7319ae9931..adab93705f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.fetchers; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.common.UidsQuery; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java index 49313ff5d1..e611262092 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java index d6ceb01f5d..26f1bec9be 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java index fdafa9efea..83182bd526 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java index c0e2733679..c816d1ab84 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java index 8b09fabb9c..1c1ea49cbf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java index 507f883f6e..94d8395119 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java index 5d4fcd323a..0d120e60e6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java index b91c8b7cbb..aa8525c58a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.di.IdentifiableStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboFields.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboFields.java index d494683370..98c8f5f63b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java index f96f6f0600..5e3239ddc5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java @@ -32,8 +32,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboTableInfo.java index f06208e3a9..788cd6efba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboUidsSeeker.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboUidsSeeker.java index 28c41ffcd0..48e232c75b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboUidsSeeker.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboUidsSeeker.java @@ -30,7 +30,7 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.arch.db.MultipleTableQueryBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementTableInfo; import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java index 0500b72133..483854b5df 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java index 9786ae5cde..cb14bf3a5b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.di.IdentifiableStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryFields.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryFields.java index 764cfbc984..f019ce4e8c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java index 05382c8666..c6bf8e3bf4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java index 071a9124ba..00268b5668 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java index cb5f35d77f..9e1aea8b28 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboFields.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboFields.java index fa7a27f934..890a6bd93e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class CategoryOptionComboFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java index 2f61c5d9a9..9830f1bd11 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -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.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboTableInfo.java index 0991e30ca4..a34c8a3744 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java index 899b44338d..449079846b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.di.IdentifiableEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionFields.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionFields.java index d078018de9..291e16cd77 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.data.api.Field; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java index b17ec799d0..1db21dce26 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionTableInfo.java index a01ca45fab..1b4c26850a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java index 1a7d6b72a1..8d14caaf4e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryTableInfo.java index b43c9209f8..7626c361c5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java index 011c409231..e17243bf1f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java @@ -31,7 +31,7 @@ import android.database.Cursor; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java index 9144387abd..5c424e65c8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java @@ -31,8 +31,8 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java index 428c02f4f7..70ec1c6433 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java @@ -31,7 +31,7 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public class LinkModelStoreImpl diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java index 5895a94ba5..a3d73246f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java @@ -31,7 +31,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java index 689fbad90d..31f55dbe88 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; public final class ObjectStyleChildrenAppender, diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java index 9338b9db76..ce5135a378 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleFields.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleFields.java index 367583924f..b8dfd29876 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; public final class ObjectStyleFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java index 8586530d72..5a2481c21b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; public class ObjectStyleHandlerImpl extends ObjectWithoutUidSyncHandlerImpl implements ObjectStyleHandler { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java index 3a244ab857..0b345ae043 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; interface ObjectStyleStore extends ObjectWithoutUidStore { & ObjectWithUidInterface> ObjectStyle getStyle(O objectWithStyle, diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java index 265a8130c0..b7d0786676 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleTableInfo.java index cb094f20ec..7b43df763f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.utils.Utils; public final class ObjectStyleTableInfo { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java index 8e662791b8..d655b3026f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java @@ -30,8 +30,8 @@ import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java index 6d45b06b45..d20ae633eb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.utils.Utils; -import static org.hisp.dhis.android.core.arch.db.TableInfo.SORT_ORDER; +import static org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo.SORT_ORDER; import static org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel.Columns.UID; import static org.hisp.dhis.android.core.utils.Utils.commaAndSpaceSeparatedArrayValues; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java b/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java index c8f7836938..6f52a8344e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java @@ -28,18 +28,18 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.executors.CursorExecutorImpl; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStoreImpl; -import org.hisp.dhis.android.core.arch.db.stores.ObjectWithUidChildStore; -import org.hisp.dhis.android.core.arch.db.stores.ObjectWithUidChildStoreImpl; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStoreImpl; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStoreImpl; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStoreImpl; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStoreImpl; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public final class StoreFactory { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java index 2f1320ee48..d83deb2648 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingTableInfo.java index d5a622c22b..ef21673300 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.utils.Utils; public final class ValueTypeDeviceRenderingTableInfo { diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java index 46d43086ff..aadccb31a9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.configuration; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationTableInfo.java index 3d8e62050c..409cf1b8b4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.configuration; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java index 24f82a8ed4..79b40aac04 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantFields.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantFields.java index 0ea67e9f8e..b847300a8a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class ConstantFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java index 170fa91eea..55dac49cae 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantTableInfo.java index 8d09a78eb1..c320e066fb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/d2manager/OkHttpClientFactory.java b/core/src/main/java/org/hisp/dhis/android/core/d2manager/OkHttpClientFactory.java index bf1c3fa517..210e5a0f80 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/d2manager/OkHttpClientFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/d2manager/OkHttpClientFactory.java @@ -32,7 +32,7 @@ import android.util.Log; import org.hisp.dhis.android.BuildConfig; -import org.hisp.dhis.android.core.arch.api.retrofit.PreventURLDecodeInterceptor; +import org.hisp.dhis.android.core.arch.api.internal.PreventURLDecodeInterceptor; import org.hisp.dhis.android.core.data.api.BasicAuthenticatorFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java index e3cb9d955a..c9775161e3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java index e68d9abecf..5916079cb9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalFields.java index ede9078c69..3e1617c170 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java index 8850645087..72e87fff3b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalTableInfo.java index 785df18085..0320632bf8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java index 4f5ef559c8..1a6228411c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementFields.java index d6663070df..171804df5a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandFields.java index 1735805ae7..5fbc2c45ac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; public final class DataElementOperandFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java index 8c5a304ac9..83bc184e90 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandTableInfo.java index 53fd1638ac..e663663e7a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java index ffb669f447..e4a4fc420a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementTableInfo.java index 7871cd0d94..b4e30c1d87 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java index 02043ca4b5..7dfe050dd1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodFields.java index 65595ebfc3..2c3ad586f0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class DataInputPeriodFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java index 9dc8d5b4df..a2c61e7836 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodTableInfo.java index 86e695396d..eefaed428c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java index 9eaa657e58..674366c9f9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java index f7b83755a7..29c56ae0d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java index 0d11ec9c15..020522f1b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationFields.java index 487da54482..229ad121a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class DataSetCompleteRegistrationFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationPostCall.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationPostCall.java index 6b6b094041..414b7bdcf7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationPostCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationPostCall.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.imports.DataValueImportSummary; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java index 2787fb3d5b..44d5f73e07 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationTableInfo.java index 07a24514f7..e2fd93db06 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java index c9f45d428e..03017a40f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java index 5a62387798..9b6ea5b770 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java index 4f66f695ef..93677f6176 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java index b892f6c353..fa8e58c182 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java index 239e1aa1d0..464c6f38b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java @@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java index 3650a85084..0287ef9ba6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementFields.java index 442ec63bb9..6a8305e855 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class DataSetElementFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java index ad3a8e370d..23f2e22754 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java index f1bd5069ce..d223987c6c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetFields.java index 99258e327e..9d1abb2873 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.ObjectStyle; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java index 3a36cae900..d391bdcb4b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java index c02f8a017c..26bb3707df 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java index f35d9939ac..ae1436a5fa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetTableInfo.java index 74665ed6c3..f03933550a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java index c66bb0a2b4..1541d2cb99 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java index 0cb852d4c3..ad741a5c65 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java index e43445a2b6..73827fb5ea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java index dfe82af996..f76028de01 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionFields.java index d95bfb4b8f..d958b2427a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.dataelement.DataElementOperand; import org.hisp.dhis.android.core.dataelement.DataElementOperandFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java index 5a65258620..f2ac19b6ed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java index 0cc61bf3e9..d5e548067b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java index ee4599bd9e..26bf38bf25 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java index 20c17b018b..09d14333cb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionTableInfo.java index 3e77aa08a4..b438103264 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java index 4c84010f86..6641ba7cbd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueFields.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueFields.java index 9c9702e0ea..09672cdc62 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePostCall.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePostCall.java index 83e8bbbc1b..ad222b5ffc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePostCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePostCall.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.imports.DataValueImportSummary; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java index 9fa779dc27..503bbc547c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueTableInfo.java index f76a30bc3e..9923e90503 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java index d35aca88e7..0d0047ae14 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java @@ -27,10 +27,10 @@ */ package org.hisp.dhis.android.core.domain.aggregated.data; -import org.hisp.dhis.android.core.arch.api.executors.RxAPICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.RxAPICallExecutor; import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; import org.hisp.dhis.android.core.arch.call.D2Progress; -import org.hisp.dhis.android.core.arch.call.D2ProgressManager; +import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java index b73e09ec7c..c17fefe361 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentFields.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentFields.java index deac075190..43ca03289d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Coordinates; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.enrollment.note.Note; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java index c9a4f97b5a..baafefad46 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java index cede60107f..c52f08816e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.CoordinateHelper; import org.hisp.dhis.android.core.common.CursorModelFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentTableInfo.java index a42dbfe18b..3f00cfe46d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java index 2ab60fc183..1d865305aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteFields.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteFields.java index 36e75fb36e..4fbaf07b90 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java index 657310e613..a552abe992 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteTableInfo.java index 12662006d9..a82e9a1bda 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java index c7c5d8fece..9b0f8009fc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java index 67c15058bd..c6eb23f302 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java index 515e59a6b3..c3c37e08da 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFields.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventFields.java index ec2bb202d1..acf1d00429 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Coordinates; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java index 3c7c14336a..01d479cadf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventPostCall.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventPostCall.java index 1c56cedc0f..eb1badd155 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventPostCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventPostCall.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.imports.EventWebResponse; import org.hisp.dhis.android.core.imports.TrackerImportConflict; import org.hisp.dhis.android.core.systeminfo.DHISVersionManager; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java index d6e89aa77c..b05ea59e17 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java @@ -30,9 +30,9 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.CoordinateHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventTableInfo.java index c19756207f..b945648fdb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java index 015f521548..0dfec871fc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.imports; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictTableInfo.java index 1d90676175..7ba93eb552 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.imports; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java index 31b7dab01c..f43f823208 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java index 3ad64bd98a..6818e02207 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java index 81e5bed974..45570a2065 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java index 6c3bf063e5..a0d920cb44 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java index 125f92839b..d68ee50013 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.di.IdentifiableEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorFields.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorFields.java index a2dd5aa928..9a693f579e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java index 757de150ee..f451390053 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java index df99a10575..45b671699a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java index 8595b5ff12..548e2d957e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java index 01bfc0bee9..842770d108 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.di.IdentifiableEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeFields.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeFields.java index c9f50ccc7d..10aee1fa21 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java index 692d650d17..753566f370 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java index 466b9c7d15..e54ddad021 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java index 62a2a3ecfb..56bfc76afb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendFields.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendFields.java index 828bb33d23..00ecd25387 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class LegendFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetFields.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetFields.java index 34c3d0762c..418d7e1122 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; public final class LegendSetFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java index 67ee199362..d0f7ca7432 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetTableInfo.java index 972b79f13f..2f2647a607 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java index 41c0c7ea48..6f28df0891 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java @@ -30,9 +30,9 @@ import android.database.sqlite.SQLiteStatement; -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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendTableInfo.java index fe2a437104..9a61a48d21 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java index e5a801ebaa..24cd675a3d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java index 0eb223b3d1..f815bbc0cd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java index fe3e63bf79..afb693e74e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorTableInfo.java index 78602c91eb..cb4c37211f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java index 08e590d15b..9105625577 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationTableInfo.java index 53bade169d..ccba4f223e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionFields.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionFields.java index 5afa6ec111..6a1ab696b2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleFields; import org.hisp.dhis.android.core.data.api.Field; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java index eff860c6d0..2b044407aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupFields.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupFields.java index 49f40b6cf8..ee354a1550 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java index cbbe1e55a9..1afcdf2b59 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.stores.ObjectWithUidChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java index 5992d099eb..07daa88b9f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java index 82cecd924f..6fb6cd927c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java index 3591b47c25..b8600236ca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupTableInfo.java index 76bd96fa0a..9d61018b33 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java index ec9c6f32d3..07df1f9338 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetFields.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetFields.java index c0b71cfc51..9569b114bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.ValueType; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java index 483604aba2..813eb19667 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java index fb0476e8e1..dd19892b95 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetTableInfo.java index 942cf0a076..8864e3fe45 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java index 56d6eb6176..46e6c2ea9f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java @@ -30,9 +30,9 @@ import android.database.sqlite.SQLiteStatement; -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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionTableInfo.java index 546ec1979b..71443aaf37 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java index 5d9d6ff34a..174c13e1c7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java @@ -29,7 +29,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java index 8849ab8368..29c48d34ce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java index d62a534e29..0cb8f0aafa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.di.IdentifiableStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitFields.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitFields.java index 543d3b1a26..139b15a6ca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java index b806fa4052..e8b932ce32 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.di.IdentifiableEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupFields.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupFields.java index e14b57e98d..75efe48cab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.BaseNameableObject; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java index 0d95af49f2..3c4913c0d5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupTableInfo.java index a0bf318e8a..c2ec060a37 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java index 0b67ddfe37..f945c1ff78 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java index 9407a6532a..f7b96989c2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.di.IdentifiableEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelFields.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelFields.java index 5bd8d9c92a..6a0bafa9a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; public final class OrganisationUnitLevelFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java index 620294a3f4..620d0d9e9a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelTableInfo.java index c58af040c1..25e54238bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java index 633341d613..2614a5098d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java index a16eb9a9b3..a8af0252db 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java index 1c188d01de..7846f54e3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java index a9e047d85b..0edc0f0d82 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java index 367dc19249..005c1ce4bd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java index e9fbd060bc..a22b70e00e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.program.ProgramTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java index 261925b1f5..7f684c02e5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitTableInfo.java index 8dc3372881..d11d3c8acb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java index 14cf521712..3d22a7e3a4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/InPeriodQueryHelper.java b/core/src/main/java/org/hisp/dhis/android/core/period/InPeriodQueryHelper.java index d3b1795d07..d98ee8163a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/InPeriodQueryHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/InPeriodQueryHelper.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.period; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java index be3bddf647..e2a6cddcd0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.period; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLOrderType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java index cb26539b4c..b191c4fb9d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.period; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java index 0740119bc8..5d349cb2c6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramFields.java index 74f1be582d..4520dc7dcf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.ObjectStyle; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java index a34579caf7..a9d26142c1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorFields.java index a11a27fbc3..aae9317bad 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.AggregationType; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.Property; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java index 0770d94019..a40ad71c58 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java index bf916ec0b5..8855d3af6d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.java index a370e93df2..3fb401af81 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java index 4aa61fd993..75cc40ee02 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionFields.java index 4cef9644c8..ed2d7b9494 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class ProgramRuleActionFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java index f8ba66e0f0..55583ee56f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionTableInfo.java index 879a61a6a4..1d4819b7aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java index e4b0df7145..f6658f8787 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java index 46a8d32376..6060438159 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleFields.java index 4867366036..1dbd957302 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class ProgramRuleFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java index b26a3afc45..ecdf881beb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleTableInfo.java index c735ba4c9f..c0a4692f4d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java index cd6358f26c..4e03f3e04e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableFields.java index 5abd8ed291..a4209e9c79 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class ProgramRuleVariableFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java index 92aeeb95f0..4617bab89c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableTableInfo.java index 2fc92d4f7a..7faa60be9d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java index 3d57bf765a..688cc1ee11 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java index 40a73c2b04..15e590e1ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java index b70ef474cd..d4637f6ec3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java index 8ee39cbfee..31c00a6671 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionFields.java index 4c4960de64..97bab64cbf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleFields; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java index ec91062d81..181f5a58c6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionTableInfo.java index 598add6c60..7cf0d9a4d7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java index 7022165cf3..1a40c45090 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java index 3d73a74f03..0d5377ac2e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementFields.java index 2b815f5d3a..8e85888658 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java index 1da06e989d..e4211d9dc0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java index a37d9bec9d..2975cfe674 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java index c686239e35..fae478cd88 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java index 51cd686d55..bbe0657976 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.di.IdentifiableStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageFields.java index 4662d8450e..e72235c593 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.FormType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java index f53b04b1ea..b02a243bad 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java index 4693e7cccc..9e4350d3dc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java index 7850ed2908..4ac6b6e5b9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java index 14538e3f6c..5e2bf96756 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionFields.java index a043c6b38d..cb16174440 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.dataelement.DataElement; import org.hisp.dhis.android.core.dataelement.DataElementFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java index 4f0a09c55e..918bed4fa9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java index 885bf2ca28..6361bca121 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java index 7fd7a61fe7..d33a4e5398 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java index 3954c350b0..07aa57abb5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java index 3325826c3a..368ee47d22 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java index 5b55d74c72..b68f70c089 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageTableInfo.java index 5d032a6b3c..99cb82ccc2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java index 70bc9da799..81aafef3f3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTableInfo.java index e183586c8e..5e1da09cba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java index 5564c24177..f8a4bdc391 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeFields.java index 010e74dc8b..3210b00284 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java index f63bdf94d8..48b90a8ba3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeTableInfo.java index 93f3fcacf8..523a00a43d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintFields.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintFields.java index d69d262835..a68f69da1f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java index 0437ca9727..fdbac1edf9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintTableInfo.java index 4bd6e805a1..1bc8a497fe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.java index 9ef411db55..d45bcc25ff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemFields.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemFields.java index 58920b631e..b353a44da5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class RelationshipItemFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java index dbd818f8d5..6739c12698 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java @@ -30,9 +30,9 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemTableInfo.java index 2b88841782..0a82088d35 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java index b53c90fe4c..73809d9414 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTableInfo.java index 2b1cb2b89e..a7a70ca366 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java index ef8bcf4ee9..e47b143d0a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeFields.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeFields.java index 29c27d288d..3dca61db50 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java index 2bf980575f..6eb3d91288 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeTableInfo.java index 9a80bdbb1f..44c9626035 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java index ab617eeb3d..09783c306e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.resource; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceTableInfo.java index 2333199b43..14e6ba1716 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.resource; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java index 165a7d1f3d..d2354ddb45 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java index caf1ae0cab..f30d567c98 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java index 66e770c51b..3a0bc9317d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingTableInfo.java index aae7ae4923..482b918465 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingsFields.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingsFields.java index dec263ebb5..8878089adb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingsFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingsFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class SystemSettingsFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java index dc4dfe86b6..82945277d4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.api.executors.RxAPICallExecutor; -import org.hisp.dhis.android.core.arch.call.CompletableProvider; +import org.hisp.dhis.android.core.arch.api.internal.RxAPICallExecutor; +import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java index 5567eb78bd..421db4e7d2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoFields.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoFields.java index e9c001353e..6890bea44b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class SystemInfoFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java index 8f9c559e60..aaf13fedd3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoTableInfo.java index 9a51024993..6a29882004 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeFields.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeFields.java index 795da08ddd..1c1958c3a3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallErrorCatcher.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallErrorCatcher.java index 0e095a70f0..64aaa8fc36 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallErrorCatcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallErrorCatcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.api.executors.APICallErrorCatcher; +import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; import java.io.IOException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java index cc18b0e9bf..26f6688bed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java index 1ca5d6b041..1177445df0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java @@ -29,7 +29,7 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java index a823feac8f..a0310d6a22 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueTableInfo.java index 8dae4db3f9..7684f8de9a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java index f59e4bd0a7..6407c21d67 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeTableInfo.java index 7b49824cd0..14d80a7fa6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java index b9b257703c..cc466d4e2f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueFields.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueFields.java index 52be8047e3..c8e69da4c8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; import java.util.Date; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java index f245f40d1a..b4907c9ff2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java @@ -30,10 +30,10 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueTableInfo.java index 42b827d177..0d1479e456 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java index a6dde8107d..f76df88491 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueFields.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueFields.java index 109dc0ecdd..753f75f26c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; import java.util.Date; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java index 74750148ed..42876ee478 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java @@ -30,10 +30,10 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.CursorModelFactory; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueTableInfo.java index 61bc238915..b058248542 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallErrorCatcher.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallErrorCatcher.java index 1a1b3efe8f..26b974ef28 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallErrorCatcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCallErrorCatcher.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.ObjectMapperFactory; -import org.hisp.dhis.android.core.arch.api.executors.APICallErrorCatcher; +import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; import org.hisp.dhis.android.core.imports.HttpMessageResponse; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFields.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFields.java index e9dbb3a08c..9c205842f6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.Property; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java index 10bac8069f..84216f75ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceListDownloadAndPersistCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceListDownloadAndPersistCallFactory.java index 4588925cad..42b5ddb038 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceListDownloadAndPersistCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceListDownloadAndPersistCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.imports.HttpMessageResponse; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java index 6361ee71b9..0a51e671ee 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java @@ -30,8 +30,8 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java index d3f2cd8976..4231fa2425 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceTableInfo.java index 7eb18af601..8d30169c84 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java index cbcecdfbe7..19269186fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.api.executors.RxAPICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.RxAPICallExecutor; import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; -import org.hisp.dhis.android.core.arch.call.D2CallWithProgressImpl; +import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; import org.hisp.dhis.android.core.arch.call.D2Progress; -import org.hisp.dhis.android.core.arch.call.D2ProgressManager; +import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.api.OuMode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java index 6b28dd0791..1c2fbf59a9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.stores.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeFields.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeFields.java index 18306e95af..44b65c4734 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; public final class TrackedEntityTypeAttributeFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java index 7c7f14de35..98f2d6264a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.tableinfos.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeTableInfo.java index 634ec4245c..3b6528e8b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java index e48b87f6d5..931589dc3d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java index 4143b2236c..f980d16ba1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.di.IdentifiableStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeFields.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeFields.java index 96bc066126..f321ccb41b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleFields; import org.hisp.dhis.android.core.data.api.Field; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java index ad7639e4ee..3f215d28b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.binders.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeTableInfo.java index 33e8015f44..2a8a86f00c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.java index bec608f5c8..012d5e4b7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity.search; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.api.OuMode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.java index 7e3e3754fe..1122a88f28 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity.search; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.data.api.OuMode; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java index b41714dc36..5fef114725 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java index a3f1f3006c..b8a0ad797e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserTableInfo.java index bba5dc4eb7..c7f604fe98 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java index afe2eb7bd1..430555b225 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java index 56223d576f..b25f434269 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java index 3c9f7844e2..86f52a6883 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.di.ObjectWithoutUidEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java index 221f784baf..e7c57c9915 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; -import org.hisp.dhis.android.core.arch.db.binders.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityTableInfo.java index 9b03efede6..9065063834 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallErrorCatcher.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallErrorCatcher.java index c9441ea24b..5a3048c325 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallErrorCatcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallErrorCatcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.api.executors.APICallErrorCatcher; +import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; import java.io.IOException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java index 344d66aaaa..b61f49a194 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.retrofit.APIUrlProvider; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java index e439197ad7..69dc2a3003 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java @@ -31,7 +31,7 @@ import android.database.sqlite.SQLiteConstraintException; import android.util.Log; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsFields.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsFields.java index 4ce4af2ee5..ac12f37b1c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class UserCredentialsFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java index 9959c62fd0..16520ef61a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -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.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsTableInfo.java index 332a06c403..dd33d25ed8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java index fa0003adf1..c591e5a670 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.di.IdentifiableStoreProvider; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java index acb437ae4e..bd17c294d8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java index fda0cdeddf..a7b99ee98d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java @@ -30,7 +30,7 @@ import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.binders.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java index 01f91fe41e..af015af486 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.TableInfo; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java index 6bc62bcb23..c089138f41 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.di.IdentifiableEntityDIModule; +import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleFields.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleFields.java index c47dce7ebb..0b1d1804eb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleFields.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleFields.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.fields.FieldsHelper; +import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper; import org.hisp.dhis.android.core.data.api.Fields; final class UserRoleFields { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java index 79108ddc21..a5186d333a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleTableInfo.java index 4f0ba5a2f0..1aa2fac6a7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java index 76f973e23f..c471a60b58 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.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.arch.db.stores.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserTableInfo.java index 7dbe70e537..74bb4a9c72 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserTableInfo.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/TableWiper.java b/core/src/main/java/org/hisp/dhis/android/core/wipe/TableWiper.java index 4a19b57745..e2462634b8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/wipe/TableWiper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/TableWiper.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.wipe; -import org.hisp.dhis.android.core.arch.db.TableInfo; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import javax.inject.Inject; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutorShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java similarity index 99% rename from core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutorShould.java rename to core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java index 9cf9ef7305..6ee7ad9913 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/APICallExecutorShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.api.executors; +package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilderShould.java index 4e1a6d298a..4946d69249 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/db/MultipleTableQueryBuilderShould.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.arch.db; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder; import org.junit.Test; import java.util.Arrays; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilderShould.java index 70516cc37d..e6025053a9 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/db/WhereClauseBuilderShould.java @@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.arch.db; import org.assertj.core.util.Lists; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.junit.Test; import static org.assertj.core.api.Java6Assertions.assertThat; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java index 68a0d03eaf..0b340f130b 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.scope; import org.assertj.core.util.Lists; -import org.hisp.dhis.android.core.arch.db.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java index 58344f62e6..8f22629c0f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.tableinfos.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.category.CategoryTableInfo; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo; import org.hisp.dhis.android.core.dataset.DataSetTableInfo; diff --git a/core/src/test/java/org/hisp/dhis/android/core/data/api/RetrofitFactory.java b/core/src/test/java/org/hisp/dhis/android/core/data/api/RetrofitFactory.java index f7c817b879..f8ac2755cc 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/data/api/RetrofitFactory.java +++ b/core/src/test/java/org/hisp/dhis/android/core/data/api/RetrofitFactory.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import org.hisp.dhis.android.core.arch.api.retrofit.PreventURLDecodeInterceptor; +import org.hisp.dhis.android.core.arch.api.internal.PreventURLDecodeInterceptor; import org.hisp.dhis.android.core.data.server.Dhis2MockServer; import okhttp3.OkHttpClient; diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/event/EventEndpointCallShould.java index 76a7e1380a..a17e5446b1 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/event/EventEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventEndpointCallShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.data.api.RetrofitFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.server.Dhis2MockServer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java index 34720ae5f2..2d24f25564 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java index 8a6e3dafe0..ad98cd1d73 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java index 3b038e6a61..ce9d5b89b9 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.api.executors.RxAPICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.RxAPICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.java index afd3ea6ee2..e59c4987c4 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity.search; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.data.api.OuMode; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java index fe76cdf095..f7af62fd60 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutorImpl; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.common.BaseCallShould; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java index 122c9c91f6..b8302347d5 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.api.executors.APICallErrorCatcher; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; -import org.hisp.dhis.android.core.arch.api.retrofit.APIUrlProvider; +import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.BaseCallShould; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java index a05818955a..4e1c4ff543 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.api.executors.APICallExecutor; +import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.SyncHandler; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.data.api.Fields; From 2c5cc9ea8f66946e743a529cdb71f7973a040c2d Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Fri, 31 May 2019 15:52:52 +0200 Subject: [PATCH 011/155] Updated id storage --- .../dhis/android/core/sms/SmsDIModule.java | 2 +- .../LocalDbRepositoryImpl.java | 85 ++++-------------- .../localdbrepository/MetadataIdsStore.java | 32 +++++++ .../OngoingSubmissionsStore.java | 88 +++++++++++++++++++ .../sms/domain/interactor/SmsSubmitCase.java | 20 ++++- .../domain/repository/LocalDbRepository.java | 12 ++- .../android/core/sms/TestRepositories.java | 8 +- 7 files changed, 166 insertions(+), 81 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/sms/data/{ => localdbrepository}/LocalDbRepositoryImpl.java (73%) create mode 100644 core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/MetadataIdsStore.java create mode 100644 core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.java index cd4c125cb5..2d00ff2e05 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.java @@ -3,7 +3,7 @@ import android.content.Context; import org.hisp.dhis.android.core.sms.data.DeviceStateRepositoryImpl; -import org.hisp.dhis.android.core.sms.data.LocalDbRepositoryImpl; +import org.hisp.dhis.android.core.sms.data.localdbrepository.LocalDbRepositoryImpl; import org.hisp.dhis.android.core.sms.data.smsrepository.SmsRepositoryImpl; import org.hisp.dhis.android.core.sms.data.webapirepository.WebApiRepositoryImpl; import org.hisp.dhis.android.core.sms.domain.repository.DeviceStateRepository; diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java similarity index 73% rename from core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java index 275e292cc6..7cd04955fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/LocalDbRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java @@ -1,8 +1,8 @@ -package org.hisp.dhis.android.core.sms.data; +package org.hisp.dhis.android.core.sms.data.localdbrepository; +import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; import org.hisp.dhis.android.core.ObjectMapperFactory; import org.hisp.dhis.android.core.common.State; @@ -20,19 +20,15 @@ import org.hisp.dhis.smscompression.models.Metadata; import java.io.IOException; -import java.util.Collection; import java.util.Collections; -import java.util.HashSet; -import java.util.Set; +import java.util.Map; import javax.inject.Inject; import io.reactivex.Completable; import io.reactivex.Single; -import io.reactivex.functions.Consumer; public class LocalDbRepositoryImpl implements LocalDbRepository { - private static final String TAG = LocalDbRepositoryImpl.class.getSimpleName(); private final Context context; private final UserModule userModule; private final TrackedEntityModule trackedEntityModule; @@ -40,16 +36,15 @@ public class LocalDbRepositoryImpl implements LocalDbRepository { private final EnrollmentModule enrollmentModule; private final EventStore eventStore; private final EnrollmentStore enrollmentStore; - private final static String METADATA_FILE = "metadata_ids"; private final static String CONFIG_FILE = "smsconfig"; private final static String KEY_GATEWAY = "gateway"; private final static String KEY_CONFIRMATION_SENDER = "confirmationsender"; private final static String KEY_WAITING_RESULT_TIMEOUT = "reading_timeout"; private static final String KEY_METADATA_CONFIG = "metadata_conf"; private static final String KEY_MODULE_ENABLED = "module_enabled"; - private static final String KEY_SUBMISSIONS_IDS = "submissions_ids"; - private Collection ongoingSubmissionIds; + private MetadataIdsStore metadataIdsStore; + private OngoingSubmissionsStore ongoingSubmissionsStore; @Inject public LocalDbRepositoryImpl(Context ctx, @@ -66,9 +61,10 @@ public LocalDbRepositoryImpl(Context ctx, this.enrollmentModule = enrollmentModule; this.eventStore = eventStore; this.enrollmentStore = enrollmentStore; + metadataIdsStore = new MetadataIdsStore(context); + ongoingSubmissionsStore = new OngoingSubmissionsStore(context); } - @Override public Single getUserName() { return Single.fromCallable(() -> userModule.authenticatedUser.get().user()); @@ -133,18 +129,12 @@ public Completable setConfirmationSenderNumber(String number) { @Override public Single getMetadataIds() { - return Single.fromCallable(() -> - ObjectMapperFactory.objectMapper().readValue( - context.openFileInput(METADATA_FILE), Metadata.class - )); + return metadataIdsStore.getMetadataIds(); } @Override public Completable setMetadataIds(final Metadata metadata) { - return Completable.fromAction(() -> - ObjectMapperFactory.objectMapper().writeValue( - context.openFileOutput(METADATA_FILE, Context.MODE_PRIVATE), metadata - )); + return metadataIdsStore.setMetadataIds(metadata); } @Override @@ -223,62 +213,19 @@ public Single isModuleEnabled() { ); } + @SuppressLint("UseSparseArrays") @Override - public Single> getOngoingSubmissionsIds() { - if (ongoingSubmissionIds != null) { - return Single.just(ongoingSubmissionIds); - } - return Single.fromCallable(() -> { - Set set = context.getSharedPreferences(CONFIG_FILE, Context.MODE_PRIVATE) - .getStringSet(KEY_SUBMISSIONS_IDS, new HashSet<>()); - HashSet numSet = new HashSet<>(); - if (set == null) { - return numSet; - } - for (String val : set) { - try { - numSet.add(Integer.parseInt(val)); - } catch (NumberFormatException e) { - Log.e(TAG, "Failed parsing submission id", e); - } - } - ongoingSubmissionIds = numSet; - return numSet; - } - ); + public Single> getOngoingSubmissions() { + return ongoingSubmissionsStore.getOngoingSubmissions(); } @Override - public Completable addOngoingSubmissionsId(Integer id) { - return getOngoingSubmissionsIds().map(ids -> { - ids.add(id); - return ids; - }).doOnSuccess( - saveOngoingSubmissionsIds() - ).ignoreElement(); + public Completable addOngoingSubmission(Integer id, SubmissionType type) { + return ongoingSubmissionsStore.addOngoingSubmission(id, type); } @Override - public Completable removeOngoingSubmissionsId(Integer id) { - return getOngoingSubmissionsIds().map(ids -> { - ids.remove(id); - return ids; - }).doOnSuccess( - saveOngoingSubmissionsIds() - ).ignoreElement(); - } - - private Consumer> saveOngoingSubmissionsIds() { - return ids -> { - HashSet set = new HashSet<>(); - for (Integer id : ids) { - set.add(Integer.toString(id)); - } - boolean result = context.getSharedPreferences(CONFIG_FILE, Context.MODE_PRIVATE) - .edit().putStringSet(KEY_SUBMISSIONS_IDS, set).commit(); - if (!result) { - throw new IOException("Failed writing submission ids to local storage"); - } - }; + public Completable removeOngoingSubmission(Integer id) { + return ongoingSubmissionsStore.removeOngoingSubmission(id); } } diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/MetadataIdsStore.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/MetadataIdsStore.java new file mode 100644 index 0000000000..dbde79ad95 --- /dev/null +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/MetadataIdsStore.java @@ -0,0 +1,32 @@ +package org.hisp.dhis.android.core.sms.data.localdbrepository; + +import android.content.Context; + +import org.hisp.dhis.android.core.ObjectMapperFactory; +import org.hisp.dhis.smscompression.models.Metadata; + +import io.reactivex.Completable; +import io.reactivex.Single; + +class MetadataIdsStore { + private final static String METADATA_FILE = "metadata_ids"; + private final Context context; + + MetadataIdsStore(Context context) { + this.context = context; + } + + Single getMetadataIds() { + return Single.fromCallable(() -> + ObjectMapperFactory.objectMapper().readValue( + context.openFileInput(METADATA_FILE), Metadata.class + )); + } + + Completable setMetadataIds(final Metadata metadata) { + return Completable.fromAction(() -> + ObjectMapperFactory.objectMapper().writeValue( + context.openFileOutput(METADATA_FILE, Context.MODE_PRIVATE), metadata + )); + } +} diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java new file mode 100644 index 0000000000..f1cb89b3b0 --- /dev/null +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java @@ -0,0 +1,88 @@ +package org.hisp.dhis.android.core.sms.data.localdbrepository; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.util.Log; + +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; + +import org.hisp.dhis.android.core.sms.domain.repository.LocalDbRepository; + +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; + +import io.reactivex.Completable; +import io.reactivex.Single; + +class OngoingSubmissionsStore { + private static final String TAG = OngoingSubmissionsStore.class.getSimpleName(); + private final static String ONGOING_SUBMISSIONS_FILE = "submissions"; + private final Context context; + private Map ongoingSubmissions; + + OngoingSubmissionsStore(Context context) { + this.context = context; + } + + @SuppressLint("UseSparseArrays") + Single> getOngoingSubmissions() { + return Single.fromCallable(() -> { + if (ongoingSubmissions != null) { + return ongoingSubmissions; + } + Type mapType = new TypeToken>() { + }.getType(); + return new GsonBuilder().create().fromJson( + new InputStreamReader( + context.openFileInput(ONGOING_SUBMISSIONS_FILE), + StandardCharsets.UTF_8), + mapType); + }).onErrorReturn(throwable -> { + Log.e(TAG, throwable.getMessage(), throwable); + return new HashMap<>(); + }).doOnSuccess(submissions -> ongoingSubmissions = submissions); + } + + Completable addOngoingSubmission(Integer id, LocalDbRepository.SubmissionType type) { + if (id == null || id < 0 || id > 255) { + return Completable.error(new IllegalArgumentException("Wrong submission id")); + } + if (type == null) { + return Completable.error(new IllegalArgumentException("Wrong submission type")); + } + return getOngoingSubmissions().flatMapCompletable(submissions -> { + if (submissions.containsKey(id)) { + return Completable.error(new IllegalArgumentException("Submission id already exists")); + } + submissions.put(id, type); + return saveOngoingSubmissions(submissions); + }); + } + + Completable removeOngoingSubmission(Integer id) { + if (id == null) { + return Completable.error(new IllegalArgumentException("Wrong submission id")); + } + return getOngoingSubmissions().flatMapCompletable(submissions -> { + submissions.remove(id); + return saveOngoingSubmissions(ongoingSubmissions); + }); + } + + private Completable saveOngoingSubmissions(Map ongoingSubmissions) { + this.ongoingSubmissions = ongoingSubmissions; + return Completable.fromAction(() -> { + Writer writer = new OutputStreamWriter( + context.openFileOutput(ONGOING_SUBMISSIONS_FILE, Context.MODE_PRIVATE), + StandardCharsets.UTF_8 + ); + new GsonBuilder().create().toJson(ongoingSubmissions, writer); + }); + } +} diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java index 6b2b32eb89..6a53b276df 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/interactor/SmsSubmitCase.java @@ -66,7 +66,8 @@ private Single convert(Converter converter) { } private Single generateSubmissionId() { - return localDbRepository.getOngoingSubmissionsIds().flatMap(ids -> { + return localDbRepository.getOngoingSubmissions().flatMap(submissions -> { + Collection ids = submissions.keySet(); for (int i = 0; i <= 255; i++) { if (!ids.contains(i)) { submissionId = i; @@ -84,7 +85,7 @@ public Observable send() { } return checkPreconditions( ).andThen( - localDbRepository.addOngoingSubmissionsId(submissionId) + localDbRepository.addOngoingSubmission(submissionId, getSubmissionType()) ).andThen( localDbRepository.getGatewayNumber() ).flatMapObservable(number -> @@ -93,13 +94,26 @@ public Observable send() { if (!finishedSending && state.getSent() == state.getTotal()) { finishedSending = true; return converter.updateSubmissionState(State.SENT_VIA_SMS).andThen( - localDbRepository.removeOngoingSubmissionsId(submissionId) + localDbRepository.removeOngoingSubmission(submissionId) ).andThen(Observable.just(state)); } return Observable.just(state); }); } + private LocalDbRepository.SubmissionType getSubmissionType() { + if (converter instanceof TrackerEventConverter) { + return LocalDbRepository.SubmissionType.TRACKER_EVENT; + } + if (converter instanceof SimpleEventConverter) { + return LocalDbRepository.SubmissionType.SIMPLE_EVENT; + } + if (converter instanceof EnrollmentConverter) { + return LocalDbRepository.SubmissionType.ENROLLMENT; + } + return null; + } + public Completable checkConfirmationSms(final boolean searchReceived, final Collection requiredStrings, final T dataModel) { diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java index 0be9e8689f..ca288ee015 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/domain/repository/LocalDbRepository.java @@ -5,7 +5,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import org.hisp.dhis.smscompression.models.Metadata; -import java.util.Collection; +import java.util.Map; import io.reactivex.Completable; import io.reactivex.Single; @@ -48,9 +48,13 @@ public interface LocalDbRepository { Single isModuleEnabled(); - Single> getOngoingSubmissionsIds(); + Single> getOngoingSubmissions(); - Completable addOngoingSubmissionsId(Integer id); + Completable addOngoingSubmission(Integer id, SubmissionType type); - Completable removeOngoingSubmissionsId(Integer id); + Completable removeOngoingSubmission(Integer id); + + enum SubmissionType { + SIMPLE_EVENT, TRACKER_EVENT, ENROLLMENT + } } diff --git a/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java b/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java index 88464fe31f..b6abc0a102 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java +++ b/core/src/test/java/org/hisp/dhis/android/core/sms/TestRepositories.java @@ -38,10 +38,10 @@ import org.hisp.dhis.smscompression.models.Metadata; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Map; import io.reactivex.Completable; import io.reactivex.Single; @@ -172,17 +172,17 @@ public Single isModuleEnabled() { } @Override - public Single> getOngoingSubmissionsIds() { + public Single> getOngoingSubmissions() { return null; } @Override - public Completable addOngoingSubmissionsId(Integer id) { + public Completable addOngoingSubmission(Integer id, SubmissionType type) { return null; } @Override - public Completable removeOngoingSubmissionsId(Integer id) { + public Completable removeOngoingSubmission(Integer id) { return null; } } From ca55a94ba31c82d723fe2a8f3932d5f4acd16a86 Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Fri, 31 May 2019 15:54:23 +0200 Subject: [PATCH 012/155] Quality check fixes --- .../sms/data/localdbrepository/LocalDbRepositoryImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java index 7cd04955fd..0f83af2b32 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/LocalDbRepositoryImpl.java @@ -1,6 +1,5 @@ package org.hisp.dhis.android.core.sms.data.localdbrepository; -import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; @@ -43,8 +42,8 @@ public class LocalDbRepositoryImpl implements LocalDbRepository { private static final String KEY_METADATA_CONFIG = "metadata_conf"; private static final String KEY_MODULE_ENABLED = "module_enabled"; - private MetadataIdsStore metadataIdsStore; - private OngoingSubmissionsStore ongoingSubmissionsStore; + private final MetadataIdsStore metadataIdsStore; + private final OngoingSubmissionsStore ongoingSubmissionsStore; @Inject public LocalDbRepositoryImpl(Context ctx, @@ -213,7 +212,6 @@ public Single isModuleEnabled() { ); } - @SuppressLint("UseSparseArrays") @Override public Single> getOngoingSubmissions() { return ongoingSubmissionsStore.getOngoingSubmissions(); From bfd193dad21f89a632f1b70e8eaed05a42a43f81 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:00:00 +0200 Subject: [PATCH 013/155] [ANDROSDK-850] Refactor store package --- .../internal/IdentifiableStatementBinder.java | 2 +- .../{ => binders}/internal/NameableStatementBinder.java | 2 +- .../db/stores/{ => binders}/internal/StatementBinder.java | 2 +- .../{ => binders}/internal/WhereStatementBinder.java | 2 +- .../arch/db/stores/internal/LinkModelChildStoreImpl.java | 1 + .../db/stores/internal/ObjectWithUidChildStoreImpl.java | 1 + .../db/stores/internal/SingleParentChildStoreImpl.java | 1 + .../internal/LinkTableChildProjection.java | 2 +- .../internal/SingleParentChildProjection.java | 2 +- .../core/category/CategoryCategoryComboLinkStore.java | 2 +- .../core/category/CategoryCategoryComboLinkTableInfo.java | 2 +- .../core/category/CategoryCategoryOptionLinkStore.java | 2 +- .../category/CategoryCategoryOptionLinkTableInfo.java | 2 +- .../dhis/android/core/category/CategoryComboStore.java | 4 ++-- .../CategoryOptionComboCategoryOptionLinkStore.java | 2 +- .../CategoryOptionComboCategoryOptionLinkTableInfo.java | 2 +- .../core/category/CategoryOptionComboStoreImpl.java | 4 ++-- .../dhis/android/core/category/CategoryOptionStore.java | 4 ++-- .../hisp/dhis/android/core/category/CategoryStore.java | 4 ++-- .../android/core/common/IdentifiableObjectStoreImpl.java | 2 +- .../core/common/IdentifiableObjectWithStateStoreImpl.java | 2 +- .../hisp/dhis/android/core/common/LinkModelStoreImpl.java | 2 +- .../hisp/dhis/android/core/common/ObjectStoreImpl.java | 2 +- .../dhis/android/core/common/ObjectStyleStoreImpl.java | 4 ++-- .../android/core/common/ObjectWithoutUidStoreImpl.java | 4 ++-- .../dhis/android/core/common/SQLStatementBuilder.java | 2 +- .../org/hisp/dhis/android/core/common/StoreFactory.java | 8 ++++---- .../core/common/ValueTypeDeviceRenderingStore.java | 4 ++-- .../core/configuration/ConfigurationStoreImpl.java | 2 +- .../hisp/dhis/android/core/constant/ConstantStore.java | 4 ++-- .../dhis/android/core/dataapproval/DataApprovalStore.java | 4 ++-- .../android/core/dataelement/DataElementOperandStore.java | 2 +- .../dhis/android/core/dataelement/DataElementStore.java | 4 ++-- .../android/core/dataset/DataInputPeriodLinkStore.java | 4 ++-- .../dataset/DataSetCompleteRegistrationStoreImpl.java | 4 ++-- .../DataSetCompulsoryDataElementOperandLinkStore.java | 2 +- .../DataSetCompulsoryDataElementOperandLinkTableInfo.java | 2 +- .../android/core/dataset/DataSetDataElementLinkStore.java | 2 +- .../android/core/dataset/DataSetElementLinkTableInfo.java | 2 +- .../core/dataset/DataSetOrganisationUnitLinkStore.java | 2 +- .../dataset/DataSetOrganisationUnitLinkTableInfo.java | 2 +- .../org/hisp/dhis/android/core/dataset/DataSetStore.java | 4 ++-- .../android/core/dataset/SectionDataElementLinkStore.java | 2 +- .../core/dataset/SectionDataElementLinkTableInfo.java | 2 +- .../core/dataset/SectionGreyedFieldsLinkStore.java | 2 +- .../core/dataset/SectionGreyedFieldsLinkTableInfo.java | 2 +- .../org/hisp/dhis/android/core/dataset/SectionStore.java | 6 +++--- .../hisp/dhis/android/core/datavalue/DataValueStore.java | 4 ++-- .../dhis/android/core/enrollment/EnrollmentStoreImpl.java | 4 ++-- .../hisp/dhis/android/core/enrollment/note/NoteStore.java | 6 +++--- .../org/hisp/dhis/android/core/event/EventStoreImpl.java | 4 ++-- .../android/core/imports/TrackerImportConflictStore.java | 2 +- .../android/core/indicator/DataSetIndicatorLinkStore.java | 2 +- .../core/indicator/DataSetIndicatorLinkTableInfo.java | 2 +- .../hisp/dhis/android/core/indicator/IndicatorStore.java | 4 ++-- .../dhis/android/core/indicator/IndicatorTypeStore.java | 4 ++-- .../hisp/dhis/android/core/legendset/LegendSetStore.java | 4 ++-- .../org/hisp/dhis/android/core/legendset/LegendStore.java | 6 +++--- .../legendset/ProgramIndicatorLegendSetLinkStore.java | 2 +- .../legendset/ProgramIndicatorLegendSetLinkTableInfo.java | 2 +- .../hisp/dhis/android/core/maintenance/D2ErrorStore.java | 2 +- .../core/maintenance/ForeignKeyViolationStore.java | 2 +- .../android/core/option/OptionGroupOptionLinkStore.java | 2 +- .../core/option/OptionGroupOptionLinkTableInfo.java | 2 +- .../hisp/dhis/android/core/option/OptionGroupStore.java | 4 ++-- .../org/hisp/dhis/android/core/option/OptionSetStore.java | 4 ++-- .../org/hisp/dhis/android/core/option/OptionStore.java | 6 +++--- .../core/organisationunit/OrganisationUnitGroupStore.java | 4 ++-- .../core/organisationunit/OrganisationUnitLevelStore.java | 4 ++-- .../OrganisationUnitOrganisationUnitGroupLinkStore.java | 2 +- ...rganisationUnitOrganisationUnitGroupLinkTableInfo.java | 2 +- .../OrganisationUnitProgramLinkStore.java | 2 +- .../OrganisationUnitProgramLinkTableInfo.java | 2 +- .../core/organisationunit/OrganisationUnitStore.java | 4 ++-- .../hisp/dhis/android/core/period/PeriodStoreImpl.java | 4 ++-- .../dhis/android/core/program/ProgramIndicatorStore.java | 6 +++--- .../dhis/android/core/program/ProgramRuleActionStore.java | 6 +++--- .../hisp/dhis/android/core/program/ProgramRuleStore.java | 6 +++--- .../android/core/program/ProgramRuleVariableStore.java | 6 +++--- .../core/program/ProgramSectionAttributeLinkStore.java | 2 +- .../program/ProgramSectionAttributeLinkTableInfo.java | 2 +- .../dhis/android/core/program/ProgramSectionStore.java | 6 +++--- .../core/program/ProgramStageDataElementStore.java | 4 ++-- .../core/program/ProgramStageDataElementTableInfo.java | 2 +- .../program/ProgramStageSectionDataElementLinkStore.java | 2 +- .../ProgramStageSectionDataElementLinkTableInfo.java | 2 +- .../ProgramStageSectionProgramIndicatorLinkStore.java | 2 +- .../ProgramStageSectionProgramIndicatorLinkTableInfo.java | 2 +- .../android/core/program/ProgramStageSectionStore.java | 6 +++--- .../hisp/dhis/android/core/program/ProgramStageStore.java | 6 +++--- .../org/hisp/dhis/android/core/program/ProgramStore.java | 4 ++-- .../core/program/ProgramTrackedEntityAttributeStore.java | 6 +++--- .../core/relationship/RelationshipConstraintStore.java | 4 ++-- .../core/relationship/RelationshipItemStoreImpl.java | 4 ++-- .../android/core/relationship/RelationshipStoreImpl.java | 2 +- .../android/core/relationship/RelationshipTypeStore.java | 4 ++-- .../dhis/android/core/resource/ResourceStoreImpl.java | 4 ++-- .../dhis/android/core/settings/SystemSettingStore.java | 4 ++-- .../dhis/android/core/systeminfo/SystemInfoStore.java | 4 ++-- .../TrackedEntityAttributeReservedValueStore.java | 4 ++-- .../core/trackedentity/TrackedEntityAttributeStore.java | 4 ++-- .../TrackedEntityAttributeValueStoreImpl.java | 6 +++--- .../trackedentity/TrackedEntityDataValueStoreImpl.java | 6 +++--- .../trackedentity/TrackedEntityInstanceStoreImpl.java | 2 +- .../trackedentity/TrackedEntityTypeAttributeStore.java | 4 ++-- .../core/trackedentity/TrackedEntityTypeStore.java | 4 ++-- .../dhis/android/core/user/AuthenticatedUserStore.java | 4 ++-- .../org/hisp/dhis/android/core/user/AuthorityStore.java | 4 ++-- .../dhis/android/core/user/UserCredentialsStoreImpl.java | 4 ++-- .../core/user/UserOrganisationUnitLinkStoreImpl.java | 2 +- .../core/user/UserOrganisationUnitLinkTableInfo.java | 2 +- .../org/hisp/dhis/android/core/user/UserRoleStore.java | 4 ++-- .../java/org/hisp/dhis/android/core/user/UserStore.java | 4 ++-- .../android/core/common/SQLStatementBuilderShould.java | 2 +- 114 files changed, 187 insertions(+), 184 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => binders}/internal/IdentifiableStatementBinder.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => binders}/internal/NameableStatementBinder.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => binders}/internal/StatementBinder.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => binders}/internal/WhereStatementBinder.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => projections}/internal/LinkTableChildProjection.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/{ => projections}/internal/SingleParentChildProjection.java (96%) diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableStatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java index e123cfbe50..06590f5ffb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.stores.internal; +package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/NameableStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/NameableStatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java index a83d12d25e..b2d402c58f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/NameableStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.stores.internal; +package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java index bb94690e17..3946afab0b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.stores.internal; +package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/WhereStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/WhereStatementBinder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.java index c312827297..0a3e24d494 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/WhereStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.db.stores.internal; +package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java index 66a8beea34..ce22d8a36c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutor; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java index 3ed821caa6..39c839082b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java @@ -29,6 +29,7 @@ import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java index 60ab973f7d..007f04e4e7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java @@ -29,6 +29,7 @@ import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkTableChildProjection.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/projections/internal/LinkTableChildProjection.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkTableChildProjection.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/projections/internal/LinkTableChildProjection.java index 8e58ebb6aa..5202ecbe48 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkTableChildProjection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/projections/internal/LinkTableChildProjection.java @@ -25,7 +25,7 @@ * (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.arch.db.stores.internal; +package org.hisp.dhis.android.core.arch.db.stores.projections.internal; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildProjection.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/projections/internal/SingleParentChildProjection.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildProjection.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/projections/internal/SingleParentChildProjection.java index bb0e91218b..b69daf8fbf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildProjection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/projections/internal/SingleParentChildProjection.java @@ -25,7 +25,7 @@ * (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.arch.db.stores.internal; +package org.hisp.dhis.android.core.arch.db.stores.projections.internal; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java index 26f1bec9be..b62b617540 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java index 83182bd526..6f35413124 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java index 1c1ea49cbf..340619f009 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java index 94d8395119..1fcd806e51 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java index 5e3239ddc5..c519a5ae43 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java @@ -32,8 +32,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java index 00268b5668..80aac152a6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java index 9e1aea8b28..d088af4b62 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java index 9830f1bd11..b2653b9c80 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java @@ -32,8 +32,8 @@ import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java index 1db21dce26..9329dd68ff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java index 8d14caaf4e..99029cbf6d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java index e17243bf1f..f374c28754 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java @@ -31,7 +31,7 @@ import android.database.Cursor; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java index 5c424e65c8..024c1fa67e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java @@ -32,7 +32,7 @@ import android.database.sqlite.SQLiteStatement; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java index 70ec1c6433..4a42f7358a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java @@ -31,7 +31,7 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public class LinkModelStoreImpl diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java index a3d73246f1..a689fe1fe3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java @@ -31,7 +31,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java index b7d0786676..aed0c3417c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java index d655b3026f..4badab39d0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java @@ -30,8 +30,8 @@ import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java index d20ae633eb..dfedb5d1a8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.common; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.utils.Utils; import static org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo.SORT_ORDER; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java b/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java index 6f52a8344e..163861fbd6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.common; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStoreImpl; @@ -38,8 +38,8 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStoreImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStoreImpl; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public final class StoreFactory { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java index d83deb2648..8238b2d62b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java index aadccb31a9..1a3c214d29 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.configuration; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java index 55dac49cae..e61543f3f5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java index 72e87fff3b..1d37045331 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java index 83bc184e90..d3ad03ed17 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java index e4a4fc420a..8e4f9cd813 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java index a2c61e7836..0e9ffb3b6a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java index 44d5f73e07..498b87b326 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java index 9b6ea5b770..0bda53a1de 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java index 93677f6176..5f63075c53 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java index fa8e58c182..b60495faa2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java index 23f2e22754..e5d9f6c3ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java index d391bdcb4b..bf17c53424 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java index 26bb3707df..c1d2a9c5db 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java index ae1436a5fa..086fe2021f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java index 73827fb5ea..6cef39f002 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java index f76028de01..391beb8e69 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java index d5e548067b..926940b097 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java index 26bf38bf25..9f55dd432d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java index 09d14333cb..34f75f4550 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java index 503bbc547c..3b9d4af8e6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java index c52f08816e..2fc4cb3908 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.enrollment; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.CoordinateHelper; import org.hisp.dhis.android.core.common.CursorModelFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java index a552abe992..065ed17ce8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java index b05ea59e17..5014391a28 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java @@ -31,8 +31,8 @@ import android.database.Cursor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.CoordinateHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java index 0dfec871fc..48f2344124 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.imports; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java index 6818e02207..7ed72a9f2d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java index 45570a2065..663f382da6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java index f451390053..f9c454ca58 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java index 753566f370..b79b296ec4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java index d0f7ca7432..5d7a3958b7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java index 6f28df0891..0d197b7bd1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java @@ -30,9 +30,9 @@ import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java index 24cd675a3d..4e3d8a49e7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java index f815bbc0cd..5f50acb6b7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.legendset; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java index afb693e74e..c275777ffb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java index 9105625577..edfb772e3c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java index 07daa88b9f..510ad3a23d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java index 6fb6cd927c..734c168d13 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java index b8600236ca..cec6ff97cc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java index dd19892b95..7687697bb1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java index 46e6c2ea9f..bd9f30475b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java @@ -30,9 +30,9 @@ import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java index 3c4913c0d5..3fc75884b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java index 620d0d9e9a..9d3bae9c5b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java index 2614a5098d..c321701867 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java index a8af0252db..e3b8cbcbd5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java index 005c1ce4bd..6e0deac6b2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java index a22b70e00e..3a14254a3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.program.ProgramTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java index 7f684c02e5..71179bc72d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java index e2a6cddcd0..fce1f232c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.period; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLOrderType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java index 8855d3af6d..0c4b7326f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java index 55583ee56f..28e6ead316 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java index ecdf881beb..81e518b451 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java index 4617bab89c..f946608593 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java index 15e590e1ba..dc33211c7c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java index d4637f6ec3..f1748e3c85 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java index 181f5a58c6..3f74a64c1b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java index e4211d9dc0..da3cba3de3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java index 2975cfe674..43822460e9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java index 4ac6b6e5b9..94b77b8096 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java index 5e2bf96756..006eee9d36 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java index 6361bca121..d6e3149cd5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java index d33a4e5398..28b6f6dc74 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java index 07aa57abb5..8c5a3f1247 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java index b68f70c089..94c9508b48 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java index 81aafef3f3..f66ce9393a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java @@ -32,8 +32,8 @@ import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java index 48b90a8ba3..0879a79513 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java index fdbac1edf9..4e32850b6d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java index 6739c12698..2a6acee009 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java @@ -31,8 +31,8 @@ import android.database.Cursor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java index 73809d9414..0b380f82c7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.relationship; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java index 6eb3d91288..72926c7fb3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java index 09783c306e..2645c5ba83 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.resource; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java index 3a0bc9317d..6b8d787c75 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java index aaf13fedd3..11ba7e68ae 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java index a0310d6a22..cdf0d677a4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java index 6407c21d67..7745f4c669 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java index b4907c9ff2..daae66cc04 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java @@ -31,9 +31,9 @@ import android.database.Cursor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java index 42876ee478..e36fa2b92d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java @@ -31,9 +31,9 @@ import android.database.Cursor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.CursorModelFactory; import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java index 4231fa2425..9a41b51d4b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java index 98f2d6264a..e17006c7ff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java index 3f215d28b0..288fdfe4fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.db.stores.internal.NameableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java index b8a0ad797e..fa9c048183 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java index e7c57c9915..c4b9993422 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java index 16520ef61a..c5c1a2d1dc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java @@ -32,8 +32,8 @@ import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.common.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java index a7b99ee98d..d68f007ab4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java @@ -30,7 +30,7 @@ import android.database.sqlite.SQLiteStatement; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.LinkModelStoreImpl; import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java index af015af486..51a751d51c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java index a5186d333a..4eab6e2d19 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java index c471a60b58..2e02760f62 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java @@ -31,8 +31,8 @@ import android.database.sqlite.SQLiteStatement; import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableStatementBinder; -import org.hisp.dhis.android.core.arch.db.stores.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; 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; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java index 8f22629c0f..39c9fee1a2 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.category.CategoryTableInfo; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo; import org.hisp.dhis.android.core.dataset.DataSetTableInfo; From cbbb24cd69c39e49f06540d2514cd6acc66f9cfc Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:21:27 +0200 Subject: [PATCH 014/155] Refactor handlers --- ...ReadOnlyCollectionRepositoryImplIntegrationShould.java | 2 +- ...tifiableCollectionRepositoryImplIntegrationShould.java | 2 +- .../DataValueEndpointCallRealIntegrationShould.java | 4 ++-- ...ttributeReservedValueManagerRealIntegrationShould.java | 4 ++-- .../java/org/hisp/dhis/android/core/D2DIComponent.java | 4 ++-- .../core/arch/di/internal/IdentifiableEntityDIModule.java | 2 +- .../arch/di/internal/ObjectWithoutUidEntityDIModule.java | 2 +- .../{ => internal}/IdentifiableDataSyncHandlerImpl.java | 2 +- .../{ => internal}/IdentifiableSyncHandlerImpl.java | 2 +- .../arch/handlers/{ => internal}/LinkSyncHandler.java | 2 +- .../arch/handlers/{ => internal}/LinkSyncHandlerImpl.java | 2 +- .../{ => internal}/ObjectWithoutUidSyncHandlerImpl.java | 2 +- .../core/arch/handlers/{ => internal}/SyncHandler.java | 2 +- .../arch/handlers/{ => internal}/SyncHandlerBaseImpl.java | 2 +- .../{ => internal}/SyncHandlerWithTransformer.java | 2 +- .../modules/{ => internal}/MetadataModuleDownloader.java | 2 +- .../{ => internal}/RxMetadataModuleDownloader.java | 2 +- .../children/{ => internal}/ChildrenAppender.java | 2 +- .../children/{ => internal}/ChildrenAppenderExecutor.java | 2 +- .../children/{ => internal}/ChildrenSelection.java | 2 +- .../collection/ReadOnlyCollectionRepositoryImpl.java | 4 ++-- .../ReadOnlyIdentifiableCollectionRepositoryImpl.java | 2 +- .../ReadOnlyNameableCollectionRepositoryImpl.java | 2 +- .../ReadOnlyWithUidCollectionRepositoryImpl.java | 2 +- .../ReadWriteWithUidCollectionRepositoryImpl.java | 2 +- .../di/{ => internal}/RepositoriesDIModule.java | 2 +- .../ReadOnlyFirstObjectWithDownloadRepositoryImpl.java | 2 +- .../repositories/object/ReadOnlyObjectRepositoryImpl.java | 4 ++-- .../object/ReadOnlyOneObjectRepositoryFinalImpl.java | 2 +- .../object/ReadOnlyOneObjectRepositoryImpl.java | 2 +- .../object/ReadWriteWithUidDataObjectRepositoryImpl.java | 2 +- .../object/ReadWriteWithUidObjectRepositoryImpl.java | 2 +- .../object/ReadWriteWithValueObjectRepositoryImpl.java | 2 +- .../arch/repositories/paging/RepositoryDataSource.java | 4 ++-- .../core/arch/repositories/scope/RepositoryScope.java | 2 +- .../TransactionalNoResourceSyncCallProcessor.java | 2 +- .../TransactionalResourceSyncCallProcessor.java | 2 +- .../category/CategoryCategoryComboChildrenAppender.java | 2 +- .../category/CategoryCategoryOptionChildrenAppender.java | 2 +- .../core/category/CategoryCollectionRepository.java | 2 +- .../core/category/CategoryComboCollectionRepository.java | 2 +- .../core/category/CategoryComboEndpointCallFactory.java | 2 +- .../core/category/CategoryComboEntityDIModule.java | 4 ++-- .../dhis/android/core/category/CategoryComboHandler.java | 4 ++-- .../core/category/CategoryEndpointCallFactory.java | 2 +- .../android/core/category/CategoryEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/category/CategoryHandler.java | 4 ++-- .../android/core/category/CategoryModuleDownloader.java | 2 +- .../core/category/CategoryOptionCollectionRepository.java | 2 +- ...CategoryOptionComboCategoryOptionChildrenAppender.java | 2 +- .../CategoryOptionComboCategoryOptionEntityDIModule.java | 4 ++-- .../category/CategoryOptionComboChildrenAppender.java | 2 +- .../category/CategoryOptionComboCollectionRepository.java | 2 +- .../core/category/CategoryOptionComboEntityDIModule.java | 4 ++-- .../android/core/category/CategoryOptionComboHandler.java | 4 ++-- .../core/category/CategoryOptionEntityDIModule.java | 6 +++--- .../android/core/common/ObjectStyleChildrenAppender.java | 2 +- .../hisp/dhis/android/core/common/ObjectStyleHandler.java | 2 +- .../dhis/android/core/common/ObjectStyleHandlerImpl.java | 2 +- .../common/ValueTypeDeviceRenderingEntityDIModule.java | 4 ++-- .../android/core/common/ValueTypeRenderingHandler.java | 2 +- .../dhis/android/core/constant/ConstantCallFactory.java | 2 +- .../core/constant/ConstantCollectionRepository.java | 2 +- .../hisp/dhis/android/core/constant/ConstantHandler.java | 2 +- .../android/core/constant/ConstantModuleDownloader.java | 2 +- .../android/core/constant/ConstantPackageDIModule.java | 4 ++-- .../core/dataapproval/DataApprovalCallFactory.java | 2 +- .../core/dataapproval/DataApprovalEntityDIModule.java | 4 ++-- .../core/dataelement/DataElementCollectionRepository.java | 2 +- .../core/dataelement/DataElementEndpointCallFactory.java | 2 +- .../core/dataelement/DataElementEntityDIModule.java | 4 ++-- .../dhis/android/core/dataelement/DataElementHandler.java | 2 +- .../dataelement/DataElementOperandEntityDIModule.java | 4 ++-- .../core/dataset/DataInputPeriodChildrenAppender.java | 2 +- .../core/dataset/DataInputPeriodEntityDIModule.java | 4 ++-- .../android/core/dataset/DataSetCollectionRepository.java | 2 +- .../dataset/DataSetCompleteRegistrationCallFactory.java | 2 +- .../DataSetCompleteRegistrationCollectionRepository.java | 4 ++-- .../DataSetCompleteRegistrationEntityDIModule.java | 6 +++--- ...taSetCompulsoryDataElementOperandChildrenAppender.java | 2 +- ...DataSetCompulsoryDataElementOperandEntityDIModule.java | 4 ++-- .../core/dataset/DataSetElementChildrenAppender.java | 2 +- .../core/dataset/DataSetElementEntityDIModule.java | 4 ++-- .../android/core/dataset/DataSetEndpointCallFactory.java | 2 +- .../dhis/android/core/dataset/DataSetEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/dataset/DataSetHandler.java | 6 +++--- .../android/core/dataset/DataSetModuleDownloader.java | 2 +- .../android/core/dataset/SectionChildrenAppender.java | 2 +- .../android/core/dataset/SectionCollectionRepository.java | 2 +- .../core/dataset/SectionDataElementChildrenAppender.java | 2 +- .../dhis/android/core/dataset/SectionEntityDIModule.java | 4 ++-- .../core/dataset/SectionGreyedFieldsChildrenAppender.java | 2 +- .../core/dataset/SectionGreyedFieldsEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/dataset/SectionHandler.java | 6 +++--- .../core/datavalue/DataValueCollectionRepository.java | 2 +- .../core/datavalue/DataValueEndpointCallFactory.java | 2 +- .../android/core/datavalue/DataValueEntityDIModule.java | 6 +++--- .../android/core/datavalue/DataValueObjectRepository.java | 2 +- .../core/enrollment/EnrollmentChildrenAppender.java | 2 +- .../core/enrollment/EnrollmentCollectionRepository.java | 2 +- .../android/core/enrollment/EnrollmentEntityDIModule.java | 4 ++-- .../dhis/android/core/enrollment/EnrollmentHandler.java | 6 +++--- .../core/enrollment/EnrollmentObjectRepository.java | 2 +- .../core/enrollment/note/NoteChildrenAppender.java | 2 +- .../android/core/enrollment/note/NoteEntityDIModule.java | 4 ++-- .../dhis/android/core/event/EventChildrenAppender.java | 2 +- .../android/core/event/EventCollectionRepository.java | 2 +- .../hisp/dhis/android/core/event/EventEntityDIModule.java | 4 ++-- .../org/hisp/dhis/android/core/event/EventHandler.java | 4 ++-- .../dhis/android/core/event/EventObjectRepository.java | 2 +- .../android/core/event/EventPersistenceCallFactory.java | 2 +- .../TrackerImportConflictCollectionRepository.java | 2 +- .../core/imports/TrackerImportConflictEntityDIModule.java | 2 +- .../core/indicator/DataSetIndicatorChildrenAppender.java | 2 +- .../core/indicator/DataSetIndicatorEntityDIModule.java | 4 ++-- .../core/indicator/IndicatorCollectionRepository.java | 2 +- .../core/indicator/IndicatorEndpointCallFactory.java | 2 +- .../android/core/indicator/IndicatorEntityDIModule.java | 6 +++--- .../core/indicator/IndicatorTypeCollectionRepository.java | 2 +- .../core/indicator/IndicatorTypeEndpointCallFactory.java | 2 +- .../core/indicator/IndicatorTypeEntityDIModule.java | 6 +++--- .../android/core/legendset/LegendChildrenAppender.java | 2 +- .../dhis/android/core/legendset/LegendEntityDIModule.java | 4 ++-- .../core/legendset/LegendSetCollectionRepository.java | 2 +- .../android/core/legendset/LegendSetEntityDIModule.java | 4 ++-- .../dhis/android/core/legendset/LegendSetHandler.java | 4 ++-- .../core/maintenance/D2ErrorCollectionRepository.java | 2 +- .../android/core/maintenance/D2ErrorEntityDIModule.java | 2 +- .../ForeignKeyViolationCollectionRepository.java | 2 +- .../maintenance/ForeignKeyViolationEntityDIModule.java | 2 +- .../android/core/option/OptionCollectionRepository.java | 2 +- .../dhis/android/core/option/OptionEntityDIModule.java | 4 ++-- .../dhis/android/core/option/OptionGroupCallFactory.java | 2 +- .../core/option/OptionGroupCollectionRepository.java | 2 +- .../android/core/option/OptionGroupEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/option/OptionGroupHandler.java | 4 ++-- .../core/option/OptionGroupOptionChildrenAppender.java | 2 +- .../core/option/OptionGroupOptionEntityDIModule.java | 4 ++-- .../org/hisp/dhis/android/core/option/OptionHandler.java | 2 +- .../dhis/android/core/option/OptionSetCallFactory.java | 2 +- .../core/option/OptionSetCollectionRepository.java | 2 +- .../dhis/android/core/option/OptionSetEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/option/OptionSetHandler.java | 4 ++-- .../core/option/OptionSetOptionChildrenAppender.java | 2 +- .../OrganisationUnitCollectionRepository.java | 2 +- .../OrganisationUnitDataSetChildrenAppender.java | 2 +- .../organisationunit/OrganisationUnitEntityDIModule.java | 2 +- .../OrganisationUnitGroupCollectionRepository.java | 2 +- .../OrganisationUnitGroupEntityDIModule.java | 6 +++--- .../core/organisationunit/OrganisationUnitHandler.java | 2 +- .../organisationunit/OrganisationUnitHandlerImpl.java | 8 ++++---- .../OrganisationUnitLevelCollectionRepository.java | 2 +- .../OrganisationUnitLevelEndpointCallFactory.java | 2 +- .../OrganisationUnitLevelEntityDIModule.java | 6 +++--- ...nUnitOrganisationUnitGroupProgramChildrenAppender.java | 2 +- .../OrganisationUnitProgramChildrenAppender.java | 2 +- .../organisationunit/SearchOrganisationUnitHandler.java | 2 +- .../SearchOrganisationUnitHandlerImpl.java | 2 +- .../android/core/period/PeriodCollectionRepository.java | 2 +- .../dhis/android/core/period/PeriodEntityDIModule.java | 2 +- .../program/ProgramCategoryComboChildrenAppender.java | 2 +- .../android/core/program/ProgramCollectionRepository.java | 2 +- .../android/core/program/ProgramEndpointCallFactory.java | 2 +- .../dhis/android/core/program/ProgramEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/program/ProgramHandler.java | 4 ++-- .../core/program/ProgramIndicatorChildrenAppender.java | 2 +- .../program/ProgramIndicatorCollectionRepository.java | 2 +- .../core/program/ProgramIndicatorEntityDIModule.java | 4 ++-- .../android/core/program/ProgramIndicatorHandler.java | 6 +++--- .../ProgramIndicatorLegendSetChildrenAppender.java | 2 +- .../program/ProgramIndicatorLegendSetEntityDIModule.java | 4 ++-- .../android/core/program/ProgramModuleDownloader.java | 2 +- .../core/program/ProgramRuleActionChildrenAppender.java | 2 +- .../program/ProgramRuleActionCollectionRepository.java | 2 +- .../core/program/ProgramRuleActionEntityDIModule.java | 6 +++--- .../android/core/program/ProgramRuleChildrenAppender.java | 2 +- .../core/program/ProgramRuleCollectionRepository.java | 2 +- .../core/program/ProgramRuleEndpointCallFactory.java | 2 +- .../android/core/program/ProgramRuleEntityDIModule.java | 4 ++-- .../dhis/android/core/program/ProgramRuleHandler.java | 4 ++-- .../core/program/ProgramRuleVariableChildrenAppender.java | 2 +- .../program/ProgramRuleVariableCollectionRepository.java | 2 +- .../core/program/ProgramRuleVariableEntityDIModule.java | 6 +++--- .../program/ProgramSectionAttributeChildrenAppender.java | 2 +- .../program/ProgramSectionAttributeEntityDIModule.java | 4 ++-- .../core/program/ProgramSectionChildrenAppender.java | 2 +- .../core/program/ProgramSectionCollectionRepository.java | 2 +- .../core/program/ProgramSectionEntityDIModule.java | 4 ++-- .../dhis/android/core/program/ProgramSectionHandler.java | 4 ++-- .../core/program/ProgramStageChildrenAppender.java | 2 +- .../core/program/ProgramStageCollectionRepository.java | 2 +- .../program/ProgramStageDataElementChildrenAppender.java | 2 +- .../program/ProgramStageDataElementEntityDIModule.java | 2 +- .../core/program/ProgramStageDataElementHandler.java | 4 ++-- .../core/program/ProgramStageEndpointCallFactory.java | 2 +- .../android/core/program/ProgramStageEntityDIModule.java | 4 ++-- .../dhis/android/core/program/ProgramStageHandler.java | 6 +++--- .../core/program/ProgramStageSectionChildrenAppender.java | 2 +- .../ProgramStageSectionDataElementChildrenAppender.java | 2 +- .../core/program/ProgramStageSectionEntityDIModule.java | 4 ++-- .../android/core/program/ProgramStageSectionHandler.java | 6 +++--- ...ogramStageSectionProgramIndicatorChildrenAppender.java | 2 +- ...ProgramStageSectionProgramIndicatorEntityDIModule.java | 4 ++-- .../program/ProgramStageSectionsCollectionRepository.java | 2 +- .../ProgramTrackedEntityAttributeChildrenAppender.java | 2 +- .../ProgramTrackedEntityAttributeEntityDIModule.java | 2 +- .../program/ProgramTrackedEntityAttributeHandler.java | 4 ++-- .../program/ProgramTrackedEntityTypeChildrenAppender.java | 2 +- .../core/program/RelatedProgramChildrenAppender.java | 2 +- .../core/relationship/RelationshipChildrenAppender.java | 2 +- .../relationship/RelationshipCollectionRepository.java | 2 +- .../RelationshipConstraintChildrenAppender.java | 2 +- .../RelationshipConstraintEntityDIModule.java | 4 ++-- .../core/relationship/RelationshipEntityDIModule.java | 2 +- .../android/core/relationship/RelationshipHandler.java | 2 +- .../core/relationship/RelationshipHandlerImpl.java | 2 +- .../relationship/RelationshipItemChildrenAppender.java | 2 +- .../core/relationship/RelationshipItemEntityDIModule.java | 4 ++-- .../core/relationship/RelationshipObjectRepository.java | 2 +- .../RelationshipTypeCollectionRepository.java | 2 +- .../relationship/RelationshipTypeEndpointCallFactory.java | 2 +- .../core/relationship/RelationshipTypeEntityDIModule.java | 4 ++-- .../core/relationship/RelationshipTypeHandler.java | 4 ++-- .../dhis/android/core/settings/SystemSettingCall.java | 2 +- .../core/settings/SystemSettingCollectionRepository.java | 2 +- .../core/settings/SystemSettingEntityDIModule.java | 6 +++--- .../core/settings/SystemSettingModuleDownloader.java | 2 +- .../hisp/dhis/android/core/systeminfo/SystemInfoCall.java | 2 +- .../android/core/systeminfo/SystemInfoEntityDIModule.java | 6 +++--- .../core/systeminfo/SystemInfoModuleDownloader.java | 2 +- .../core/systeminfo/SystemInfoObjectRepository.java | 2 +- .../TrackedEntityAttributeCollectionRepository.java | 2 +- .../TrackedEntityAttributeEntityDIModule.java | 4 ++-- .../core/trackedentity/TrackedEntityAttributeHandler.java | 2 +- .../TrackedEntityAttributeReservedValueCallProcessor.java | 2 +- ...edEntityAttributeReservedValueEndpointCallFactory.java | 2 +- ...TrackedEntityAttributeReservedValueEntityDIModule.java | 4 ++-- .../TrackedEntityAttributeValueChildrenAppender.java | 2 +- .../TrackedEntityAttributeValueCollectionRepository.java | 2 +- .../TrackedEntityAttributeValueEntityDIModule.java | 4 ++-- .../trackedentity/TrackedEntityAttributeValueHandler.java | 4 ++-- .../TrackedEntityAttributeValueObjectRepository.java | 2 +- .../TrackedEntityDataValueChildrenAppender.java | 2 +- .../TrackedEntityDataValueCollectionRepository.java | 2 +- .../TrackedEntityDataValueEntityDIModule.java | 4 ++-- .../core/trackedentity/TrackedEntityDataValueHandler.java | 2 +- .../TrackedEntityDataValueObjectRepository.java | 2 +- .../TrackedEntityInstanceCollectionRepository.java | 2 +- .../TrackedEntityInstanceEntityDIModule.java | 2 +- .../core/trackedentity/TrackedEntityInstanceHandler.java | 4 ++-- .../TrackedEntityInstanceObjectRepository.java | 2 +- .../TrackedEntityTypeAttributeChildrenAppender.java | 2 +- .../TrackedEntityTypeAttributeCollectionRepository.java | 2 +- .../TrackedEntityTypeAttributeEntityDIModule.java | 2 +- .../core/trackedentity/TrackedEntityTypeCallFactory.java | 2 +- .../TrackedEntityTypeCollectionRepository.java | 2 +- .../trackedentity/TrackedEntityTypeEntityDIModule.java | 4 ++-- .../core/trackedentity/TrackedEntityTypeHandler.java | 2 +- .../TrackedEntityInstanceQueryCollectionRepository.java | 6 +++--- .../search/TrackedEntityInstanceQueryDataSource.java | 6 +++--- .../core/user/AuthenticatedUserEntityDIModule.java | 2 +- .../core/user/AuthenticatedUserObjectRepository.java | 2 +- .../dhis/android/core/user/AuthorityCallProcessor.java | 2 +- .../android/core/user/AuthorityCollectionRepository.java | 2 +- .../android/core/user/AuthorityEndpointCallFactory.java | 2 +- .../dhis/android/core/user/AuthorityEntityDIModule.java | 6 +++--- .../android/core/user/UserAuthenticateCallFactory.java | 2 +- .../java/org/hisp/dhis/android/core/user/UserCall.java | 2 +- .../core/user/UserCredentialsChildrenAppender.java | 2 +- .../android/core/user/UserCredentialsEntityDIModule.java | 6 +++--- .../core/user/UserCredentialsObjectRepository.java | 2 +- .../hisp/dhis/android/core/user/UserEntityDIModule.java | 4 ++-- .../java/org/hisp/dhis/android/core/user/UserHandler.java | 4 ++-- .../hisp/dhis/android/core/user/UserModuleDownloader.java | 2 +- .../hisp/dhis/android/core/user/UserObjectRepository.java | 2 +- .../core/user/UserOrganisationUnitChildrenAppender.java | 2 +- .../core/user/UserOrganisationUnitLinkEntityDIModule.java | 4 ++-- .../dhis/android/core/user/UserRoleChildrenAppender.java | 2 +- .../android/core/user/UserRoleCollectionRepository.java | 2 +- .../dhis/android/core/user/UserRoleEntityDIModule.java | 6 +++--- .../repositories/collection/RepositoryPagingShould.java | 2 +- .../android/core/category/CategoryComboHandlerShould.java | 4 ++-- .../dhis/android/core/category/CategoryHandlerShould.java | 2 +- .../core/common/ValueTypeRenderingHandlerShould.java | 2 +- .../core/dataelement/DataElementHandlerShould.java | 2 +- .../dhis/android/core/dataset/DataSetHandlerShould.java | 4 ++-- .../dhis/android/core/dataset/SectionHandlerShould.java | 4 ++-- .../android/core/enrollment/EnrollmentHandlerShould.java | 4 ++-- .../hisp/dhis/android/core/event/EventHandlerShould.java | 2 +- .../android/core/legendset/LegendSetHandlerShould.java | 4 ++-- .../dhis/android/core/option/OptionSetHandlerShould.java | 4 ++-- .../organisationunit/OrganisationUnitHandlerShould.java | 7 ++----- .../android/core/program/ProgramEndpointCallShould.java | 2 +- .../dhis/android/core/program/ProgramHandlerShould.java | 2 +- .../core/program/ProgramIndicatorHandlerShould.java | 4 ++-- .../android/core/program/ProgramRuleHandlerShould.java | 4 ++-- .../android/core/program/ProgramSectionHandlerShould.java | 4 ++-- .../program/ProgramStageDataElementHandlerShould.java | 4 ++-- .../android/core/program/ProgramStageHandlerShould.java | 4 ++-- .../core/program/ProgramStageSectionHandlerShould.java | 4 ++-- .../ProgramTrackedEntityAttributeHandlerShould.java | 4 ++-- .../core/relationship/RelationshipHandlerShould.java | 2 +- .../android/core/systeminfo/SystemInfoCallShould.java | 2 +- .../TrackedEntityAttributeHandlerShould.java | 2 +- .../trackedentity/TrackedEntityInstanceHandlerShould.java | 2 +- .../TrackedEntityInstanceQueryDataSourceShould.java | 2 +- .../android/core/user/AuthorityEndpointCallShould.java | 2 +- .../android/core/user/UserAuthenticateCallUnitShould.java | 2 +- .../org/hisp/dhis/android/core/user/UserCallShould.java | 2 +- .../hisp/dhis/android/core/user/UserHandlerShould.java | 4 ++-- 310 files changed, 439 insertions(+), 442 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/IdentifiableDataSyncHandlerImpl.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/IdentifiableSyncHandlerImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/LinkSyncHandler.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/LinkSyncHandlerImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/ObjectWithoutUidSyncHandlerImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/SyncHandler.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/SyncHandlerBaseImpl.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/{ => internal}/SyncHandlerWithTransformer.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/modules/{ => internal}/MetadataModuleDownloader.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/modules/{ => internal}/RxMetadataModuleDownloader.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/{ => internal}/ChildrenAppender.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/{ => internal}/ChildrenAppenderExecutor.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/{ => internal}/ChildrenSelection.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/{ => internal}/RepositoriesDIModule.java (96%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java index 9109b27412..8410968c93 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.data.relationship.RelationshipTypeSamples; import org.hisp.dhis.android.core.relationship.RelationshipType; import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java index edc36c15d2..3a393b7e0c 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.relationship.RelationshipType; import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java index 47dcd40ceb..652daf7eec 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java index f76986e02a..50f4ce2584 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.category.CategoryCombo; import org.hisp.dhis.android.core.category.CategoryComboTableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java index e80b643226..e6c49e3ed6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java +++ b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java @@ -31,8 +31,8 @@ import android.content.Context; import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.di.RepositoriesDIModule; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.di.internal.RepositoriesDIModule; import org.hisp.dhis.android.core.calls.MetadataCall; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java index 960e3b80eb..699649e3c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.di.internal; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java index 49f4f68816..5b8f5452db 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.di.internal; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; public interface ObjectWithoutUidEntityDIModule extends ObjectWithoutUidStoreProvider { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java index 5df0c8fcd7..b2f07959c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableDataSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java index 72644882df..6a28f17c01 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/IdentifiableSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/LinkSyncHandler.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandler.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/LinkSyncHandler.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandler.java index 6db59b02cb..90d3e0e13b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/LinkSyncHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandler.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/LinkSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/LinkSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java index 13cc9eff55..7f8e99c2ad 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/LinkSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/ObjectWithoutUidSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/ObjectWithoutUidSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java index c8e69968f5..f3b6713537 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/ObjectWithoutUidSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandler.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandler.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandler.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandler.java index 582c44068a..9e0b0dbfcc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandler.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandlerBaseImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandlerBaseImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java index b2a45362be..c52bda7fc7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandlerBaseImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandlerWithTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerWithTransformer.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandlerWithTransformer.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerWithTransformer.java index 8ff4f6918b..eb6dd92a12 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/SyncHandlerWithTransformer.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerWithTransformer.java @@ -25,7 +25,7 @@ * (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.arch.handlers; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/MetadataModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/MetadataModuleDownloader.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/modules/MetadataModuleDownloader.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/MetadataModuleDownloader.java index 29b5bdcbd3..54ef87a51f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/MetadataModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/MetadataModuleDownloader.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.modules; +package org.hisp.dhis.android.core.arch.modules.internal; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/RxMetadataModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/RxMetadataModuleDownloader.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/modules/RxMetadataModuleDownloader.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/RxMetadataModuleDownloader.java index ed7c98fd97..5568c36af4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/RxMetadataModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/RxMetadataModuleDownloader.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.modules; +package org.hisp.dhis.android.core.arch.modules.internal; import io.reactivex.Completable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenAppender.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.java index 6689ef0cb7..c684cbfa05 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.java @@ -25,7 +25,7 @@ * (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.arch.repositories.children; +package org.hisp.dhis.android.core.arch.repositories.children.internal; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenAppenderExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenAppenderExecutor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java index c543f238e6..2939b81ed7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenAppenderExecutor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java @@ -25,7 +25,7 @@ * (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.arch.repositories.children; +package org.hisp.dhis.android.core.arch.repositories.children.internal; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenSelection.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenSelection.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.java index b628a6b316..c699aa8378 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/ChildrenSelection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.java @@ -25,7 +25,7 @@ * (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.arch.repositories.children; +package org.hisp.dhis.android.core.arch.repositories.children.internal; import java.util.Collections; import java.util.HashSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java index aa6204cd38..f2864c0cdb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java @@ -29,8 +29,8 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryDataSource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java index 68e34b3548..71b056ed0e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java index 3900034cdd..cbe90fc072 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java index 45695506bc..acd020f73c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java index 1c3b195e23..9ae4b86447 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java @@ -29,7 +29,7 @@ import android.database.sqlite.SQLiteConstraintException; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/RepositoriesDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/RepositoriesDIModule.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.java index d376ce9f66..b71f76c22a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/RepositoriesDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.di; +package org.hisp.dhis.android.core.arch.repositories.di.internal; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index a6af391934..7f1d80c68a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.object; import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java index ac4c8db363..321353fdce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.arch.repositories.object; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java index f4d30fab59..a23dff90c8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.object; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java index 95e82e170b..caad589069 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.object; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java index e865e338b7..83d74d19a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.object; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataModel; import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java index d6031121b3..ffc659c3cc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java @@ -29,7 +29,7 @@ import android.database.sqlite.SQLiteConstraintException; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java index 11bb41689d..4f614f3e38 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java @@ -29,7 +29,7 @@ import android.database.sqlite.SQLiteConstraintException; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java index d79d491950..4b3e9acdbf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java @@ -29,8 +29,8 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java index c68ac2efe5..3e9c8fa46f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenSelection; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java index 8214751d7f..1f1b103106 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.processors; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java index 78fd7be261..a1dc42c84b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.processors; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java index e611262092..b905691ec4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java index c816d1ab84..8babacf213 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java index 7a75919e01..fa6ec98609 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java index 281feb0f4c..3638fecfe3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java index 0d120e60e6..390dc23187 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java index aa8525c58a..4ad11183ee 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java index 25939f4c0e..81ab9765a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java @@ -30,8 +30,8 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java index 483854b5df..144f8bbd97 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java index cb14bf3a5b..9a3eee9f1b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java index 224acf493c..1ccc15799e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java @@ -30,8 +30,8 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java index a6ad956edb..72a90432c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.modules.MetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java index bf35d56b69..6b00f95faf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java index c6bf8e3bf4..6f4efe3147 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java index e9b3e45514..f679409b7c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboChildrenAppender.java index 7e548475e1..8701b9ad0c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java index 775d040111..7e2adf4b68 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java index 5741fae0af..bf43a547fe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java index 1515e86b2c..f687329d5f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java index 449079846b..155cc07db4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java index 31f55dbe88..7540d89196 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; public final class ObjectStyleChildrenAppender, B extends ObjectWithStyle.Builder> extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java index f7472adc82..d45d040cbc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; public interface ObjectStyleHandler extends SyncHandlerWithTransformer { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java index 5a2481c21b..4977778881 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.common; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; public class ObjectStyleHandlerImpl extends ObjectWithoutUidSyncHandlerImpl implements ObjectStyleHandler { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java index 81ce698d41..ce86e19b00 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java index e50af5a7e7..2dc7275a58 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java index 79b40aac04..8b1a52fb2b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.constant; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java index b7d4870754..343c13fe50 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DoubleFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java index 19b5bb2be8..d437d905f2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantModuleDownloader.java index c918e23528..107cb3458e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.modules.MetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import java.util.List; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java index 63466fe18e..dbc6a92876 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java index c9775161e3..25d2baedd4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataapproval; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.ListNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java index 5916079cb9..e44d64c546 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataapproval; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java index 3288e510e1..fb9acc9d9e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java index 1a6228411c..f54fb95abf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataelement; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java index 594c394ea2..9c9b5f20f5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java index 7192c336a8..ecca2930c6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java index 8db23139a1..eb4146e4f5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java index 7dfe050dd1..b8ea100ef4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java index a20ee12499..9523d831d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java index 9a5cce421c..b5e3d395a0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java index 674366c9f9..5f14eb9c75 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java index 01bf3f5199..f42b4dd437 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteCollectionRepository; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java index 020522f1b0..e5cb6b5e82 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java index 03017a40f1..6e48a4a0c4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java index 89cb1db00a..0ab5c6143e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java index 0287ef9ba6..585c755849 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java index e485e07994..f8e3c1201b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java index d223987c6c..38c13f36d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.PayloadResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java index ac9676a264..f4bbac8b4c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java index 3f5ead722c..c99baafcb9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java index 080b91e187..bd10ce8f65 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.modules.MetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java index 1541d2cb99..574506803c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java index d1b91787f7..0d44a11c3e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java index ad741a5c65..169a2f2d47 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java index 252b57ee33..873f712d95 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java index f2ac19b6ed..a50092d674 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java index a32db3159c..6495766edd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java index 1c2b690895..28b7f2d116 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java index 1f9e2be564..5dbc6a258f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java index 6641ba7cbd..d21d109b44 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.PayloadResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java index bba40226d3..007b4cbd9b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java index da9557b6e3..19f6c8116c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java index c17fefe361..1af1c6de33 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java index 1c747f0fec..15f162c848 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java index b4f86465a9..2a919cbc40 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.DataOrphanCleanerImpl; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java index 9d3c6f9ea3..7f6424cb7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableDataSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java index 39f364915a..f4389f0116 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java index 1d865305aa..9dc95d0966 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment.note; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java index 5b660f8f4c..8c010d0883 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java index c6eb23f302..701f7fdd6b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java index 9a4b6761d7..0e2b0a396c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java index 945a59377e..8a36191db2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java index 5c7d874669..646c4074a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java @@ -30,8 +30,8 @@ import android.util.Log; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableDataSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java index 5e67b03af5..774f5f2123 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java index 4049c23ea0..cc634712e0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java index 25fbb7007e..7e36ba7ac1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.imports; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java index 9e3720a683..7d820604f7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.imports; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java index f43f823208..86d41b74e9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java index e1c413e985..616c52099b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java index 6f51523950..86c1235a8e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java index a0d920cb44..e70a2657d8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java index d68ee50013..ef625c45a0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java index 095c2cd970..8eab59c1cb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java index 548e2d957e..e5ac526794 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java index 842770d108..f158db492c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java index 56bfc76afb..eb022c1808 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java index 4451a4a150..e7fa8ce60b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java index b5493fd337..61f098e426 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java index a049aba128..86d0dc4338 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java index ec60ff15f6..4914c6d9ce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java index ab0573efc6..84fd46b2a5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java index 7287149386..c293747330 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java index 4c390efb67..c8d629f805 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java index 759e90aa1a..40daaa0a35 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java index 7abdc20293..905e353324 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java index fb3aa54de1..e3d716b3d5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java index 2b044407aa..7778d92110 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java index b9b430b08d..a02e71c7ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java index 2c7c2cd880..33ac542b4e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java index 34ff622988..817addf181 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java index 1afcdf2b59..b95360ada5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java index 2ffa63cc3e..473bf40163 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java index 0f9d60c669..e35f0786e9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java index 07df1f9338..9fc4da0904 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java index 3c25490303..dfa10708b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java index df6c03bb5a..ee761c016d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java index c4985bb63f..47ac7164ec 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java index 813eb19667..d89817ba82 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java index 1b4797c43a..901a9434c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java index 29c48d34ce..86444c328f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java index 0cb8f0aafa..075b617497 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java index ae9b2232f5..594cd9775f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java index e8b932ce32..8752baff81 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandler.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandler.java index 106c989c3a..6d0a6e9037 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.user.User; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java index f04fd691d8..053099c329 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java @@ -30,10 +30,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java index ac2027af7f..1c4389bb35 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java index f945c1ff78..03bd5242ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java index f7b96989c2..a02be485a0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java index 7846f54e3f..0455534024 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java index 0edc0f0d82..db453787b1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.program.Program; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandler.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandler.java index 2ffb0b00ae..0dec1ae969 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.user.User; interface SearchOrganisationUnitHandler extends SyncHandlerWithTransformer { diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java index 1a4d789b3c..c9f91d1439 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java @@ -29,7 +29,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.user.User; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java index d5a442297b..81cf6f6a2c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.period; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java index e9d7ed86d3..f452a4524e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.period; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java index 6c227d245b..782023b22f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.category.CategoryCombo; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java index 662f8b41ac..6dca635b08 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java index 5d349cb2c6..a4376d86a8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java index 027512ef13..bb09b0690c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java index b02aea401c..f63eadeceb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java index a9d26142c1..1bed6404b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java index bfd4141b85..42f1ab35a6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java index 829297341a..bf015f2140 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java index cbfe90d16b..4e61a2da2a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.legendset.LegendSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java index a40ad71c58..d7064ed84f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.legendset.LegendSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java index 63213e322a..fa5570b185 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.legendset.LegendSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java index 0a225c4e67..b976d1afcd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.modules.MetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; import org.hisp.dhis.android.core.common.UidsHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java index 75cc40ee02..b363141d31 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java index 294c688268..97d656b41d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java index 2ff1819ff6..c134288be2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java index f6658f8787..f0629a82c8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java index 34690f8c55..ec70b3431c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java index 6060438159..6580a8fc24 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java index da6f1f62c9..208f6e4fed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java index 15ddc5a926..ba8afaea1a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java index 4e03f3e04e..1c2059ef09 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java index 5e0f0508e0..adc7a2d3db 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java index a8698121f4..e88e0f7d88 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java index 688cc1ee11..4a0ee5aaee 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java index 998cf1f51a..6cbcd0cdea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java index 31c00a6671..bb2d91d198 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java index e2a52b5958..5d5f2c0a17 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java index d51d2cdc6a..f7c301d1d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java index 0acff3e568..f93c804ce3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java index 1a40c45090..fc72be51dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java index 0deba162f6..970cfb3061 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java index 0d5377ac2e..4d3ae0e4e5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java index c85fb8839a..1b3563fbd5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java index f83819bd01..b692fce9a9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java index fae478cd88..d55f380cd3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java index bbe0657976..737f0346e0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java index 039ca9c170..9c27c08ce0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java index b02a243bad..feabbdc514 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java index 9e4350d3dc..799ff74bc2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java index 4e9bdd80a7..91e3c8b601 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java index f8dbe945c7..259e0151ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java index 918bed4fa9..8e270b1fa4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java index 2668792c2d..5e295f666d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java index 91f0c6b164..a23b683735 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java index f8a4bdc391..a68d8c0d9c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java index bdf70f683c..3f4edacbf3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java index bf047e4110..10ec32571c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java index 38a7bb9bd1..e58ea28fc1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.trackedentity.TrackedEntityType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/RelatedProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/RelatedProgramChildrenAppender.java index 425e082fde..1d80ead812 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/RelatedProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/RelatedProgramChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipChildrenAppender.java index d698b4ec6f..fc56a319fc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java index 3178db7e8f..0cfcf93e09 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java index ea50813a07..02b89a4539 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java index 500eb04b36..b31978d3f4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipEntityDIModule.java index 3ce613e99f..fe0e765ab4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandler.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandler.java index bebd59e607..411cf4f0c7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; public interface RelationshipHandler extends SyncHandler { boolean doesRelationshipExist(Relationship relationship); diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerImpl.java index eca40f0b4e..83d0d9815f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemChildrenAppender.java index ee3acaed66..4526ce293c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemEntityDIModule.java index 7bbf7ebcc2..33e9b056c7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java index fa7dfe986b..e9d277c41f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java index d38ec48de7..0bb631e383 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java index e47b143d0a..4581e73dac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.relationship; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.PayloadResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java index a73b60216e..a302a90f57 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java index 0d1e78e810..81d552cdf6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java index d2354ddb45..1743ce72a6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCall.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.settings; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java index b451d4839e..e3f237a865 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java index f30d567c98..4e7c082f43 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.settings; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingModuleDownloader.java index 47456c2065..b27d610e88 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.settings; -import org.hisp.dhis.android.core.arch.modules.MetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import org.hisp.dhis.android.core.common.Unit; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java index 82945277d4..4c13c0ab3c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCall.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.api.internal.RxAPICallExecutor; import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java index 421db4e7d2..7c1be5b705 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java index 09188b67b1..d5e1a6f06e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.modules.RxMetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.RxMetadataModuleDownloader; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java index 976d7d5952..5797cc31ca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyFirstObjectWithDownloadRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java index 1822e139f6..d661bebcea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java index 2e1e7ef2ac..f91124e288 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java index 747541538f..ee61ee964b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java index c3a273fb57..5c43bd09af 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.processors.CallProcessor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java index 26f6688bed..8156420446 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.ListNoResourceWithErrorCatcherCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEntityDIModule.java index d255b41bfe..53c8d603e4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java index cc466d4e2f..6b22c23c36 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java index a4a9654315..a03f859e1f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueEntityDIModule.java index 03c3111603..9fcfd87a3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueHandler.java index da73447e95..2805939ef8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueHandler.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java index 50d3fb36e3..dbb9759d68 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java index f76df88491..6a03d0eee2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.event.Event; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java index 89702d0cb4..79391894d6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueEntityDIModule.java index 55461ccdd9..1b1dbb9cdb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueHandler.java index f63bb87c52..372b2af7b4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java index 2132fd79ef..d01620d441 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java index 04d2c10465..f796e1b9f0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java index acb667801a..f0b5c13a6a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.DataOrphanCleanerImpl; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java index fc5478f581..11906ed714 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableDataSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java index e6486d8806..636ce6228a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java index 1c2fbf59a9..35b25e236b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java index a8325f0790..944e755e77 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java index 50d2354be6..94cab9b939 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java index 931589dc3d..793c406cc8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java index 18e97ddc26..8e47b352f9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java index f980d16ba1..769b92f72b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java index b1c61dccf7..65dcf9e339 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java index a35b5c10d3..bab3b6044e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java @@ -32,9 +32,9 @@ import androidx.paging.LivePagedListBuilder; import androidx.paging.PagedList; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenSelection; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java index e6053e68e2..9887614338 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.trackedentity.search; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppenderExecutor; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenSelection; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java index 5fef114725..4cc57c062f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java index 7e5acfe767..b63265b352 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java index 664ef79b3a..22fab37f32 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.processors.CallProcessor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java index b35ae122db..756453b0ea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java index b25f434269..0d61e1171f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java index 86f52a6883..a2cc22225a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java index b61f49a194..5cd5c558ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java index 69dc2a3003..44491d3dfe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java @@ -32,7 +32,7 @@ import android.util.Log; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.data.database.Transaction; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsChildrenAppender.java index a3fc5b9705..7a9bd251a0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsEntityDIModule.java index c317dd28bc..eb8c87bdfd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsEntityDIModule.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java index 1ee3cf54ce..a1b4d99c8b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java index c591e5a670..7b2929a964 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java index f7fbfa9bd2..bda3eb0dde 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserModuleDownloader.java index b5f4eaa0ac..2a5e02a071 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserModuleDownloader.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.modules.MetadataModuleDownloader; +import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java index a7bbf7b430..d4f7d923a5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java index bd17c294d8..7546f0423f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkEntityDIModule.java index 98fbbfe70e..6ea94a3180 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java index 7e88e12384..bcf0e54fcf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java index eccbadf2d2..778cdd0ee3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java index c089138f41..bdbaf31149 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java index 692f8aa027..28de2d5baa 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java @@ -30,7 +30,7 @@ import android.content.ContentValues; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryDataSource; import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryPagingConfig; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java index ee68155d27..c9a205cbe2 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java index e3862a9244..d28b416a30 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandlerShould.java index 1695b91de5..dbb0c87481 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandlerShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java index 36b32842ed..b63b2b4d0a 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java index cfc3434e00..52dd4b698d 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java index 51215a45d4..28590d04ed 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java index 9e2261f93f..360ee00906 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java index 24d41b6cb8..35889cc2d6 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java index b9694536d4..7587917906 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java index 9d3630554e..aa1e6a6c20 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java index 7a8cb903af..c2857c8fc0 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java @@ -29,12 +29,10 @@ import org.assertj.core.util.Lists; import org.assertj.core.util.Sets; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink; @@ -53,7 +51,6 @@ import java.util.Set; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyCollectionOf; import static org.mockito.Matchers.anyListOf; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.never; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java index ad98cd1d73..dd432b0698 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java index daadfbcb16..8793650549 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java index 63f622e393..4665299f94 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.legendset.LegendSet; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java index 6d62d3d983..bb3a6c37d0 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java index 142daa93ee..3a0a57ec17 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.program; import org.assertj.core.util.Lists; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java index 1aea9c2994..7f5955e7b8 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueTypeRendering; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java index 69ac5f7897..bdb6ef0823 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java index cf5b4695d7..d7e87d1ba8 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java index ddebf18d15..fbca58f9fb 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DictionaryTableHandler; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerShould.java index 7201e8c798..ebaedddd90 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipHandlerShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.StoreWithState; import org.hisp.dhis.android.core.data.relationship.RelationshipSamples; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java index ce9d5b89b9..9c7a29e7fb 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.api.internal.RxAPICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java index 5a8781ae48..9b219bfd99 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java index 0f9962b7d6..b7f5ab87a5 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.arch.handlers.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java index 0f47bbd700..f07d7931c3 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity.search; -import org.hisp.dhis.android.core.arch.repositories.children.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceStore; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java index f7af62fd60..0fe45073f2 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.common.BaseCallShould; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java index b8302347d5..05b7d5debe 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java index 4e1c4ff543..48353871ad 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserCallShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java index bd0a5bedc3..b463391776 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.junit.Before; From 9da1ef7a531f093404785307d61879bc6240c9ce Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:29:39 +0200 Subject: [PATCH 015/155] Refactor collection repositories --- .../SystemInfoCallMockIntegrationShould.java | 2 +- .../CollectionRepositoryFactory.java | 2 +- .../ReadOnlyCollectionRepository.java | 2 +- .../ReadOnlyCollectionRepositoryImpl.java | 4 ++-- .../ReadOnlyIdentifiableCollectionRepository.java | 4 ++-- ...adOnlyIdentifiableCollectionRepositoryImpl.java | 8 ++++---- .../ReadOnlyNameableCollectionRepository.java | 4 ++-- .../ReadOnlyNameableCollectionRepositoryImpl.java | 6 +++--- .../ReadOnlyWithDownloadObjectRepository.java | 2 +- .../ReadOnlyWithUidCollectionRepository.java | 2 +- .../ReadOnlyWithUidCollectionRepositoryImpl.java | 4 ++-- .../ReadOnlyWithUploadCollectionRepository.java | 2 +- .../ReadWriteCollectionRepository.java | 2 +- .../ReadWriteWithUidCollectionRepository.java | 2 +- .../ReadWriteWithUidCollectionRepositoryImpl.java | 4 ++-- .../ReadWriteWithUploadCollectionRepository.java | 2 +- ...WriteWithUploadWithUidCollectionRepository.java | 2 +- .../{ => internal}/BaseFilterConnector.java | 6 +++--- .../{ => internal}/BooleanFilterConnector.java | 6 +++--- .../{ => internal}/DateFilterConnector.java | 6 +++--- .../{ => internal}/DoubleFilterConnector.java | 6 +++--- .../{ => internal}/EnumFilterConnector.java | 6 +++--- .../{ => internal}/FilterConnectorFactory.java | 6 +++--- .../{ => internal}/IdentifiableFilters.java | 4 ++-- .../{ => internal}/IntegerFilterConnector.java | 6 +++--- .../filters/{ => internal}/NameableFilters.java | 4 ++-- .../{ => internal}/StringFilterConnector.java | 6 +++--- .../{ => internal}/SubQueryFilterConnector.java | 6 +++--- ...dOnlyFirstObjectWithDownloadRepositoryImpl.java | 2 +- .../category/CategoryCollectionRepository.java | 6 +++--- .../CategoryComboCollectionRepository.java | 6 +++--- .../CategoryOptionCollectionRepository.java | 8 ++++---- .../CategoryOptionComboCollectionRepository.java | 6 +++--- .../constant/ConstantCollectionRepository.java | 6 +++--- .../DataElementCollectionRepository.java | 10 +++++----- .../core/dataset/DataSetCollectionRepository.java | 12 ++++++------ ...etCompleteRegistrationCollectionRepository.java | 12 ++++++------ .../core/dataset/SectionCollectionRepository.java | 10 +++++----- .../datavalue/DataValueCollectionRepository.java | 14 +++++++------- .../domain/aggregated/data/AggregatedDataCall.java | 2 +- .../enrollment/EnrollmentCollectionRepository.java | 14 +++++++------- .../core/event/EventCollectionRepository.java | 12 ++++++------ .../core/event/EventWithLimitCallFactory.java | 2 +- .../TrackerImportConflictCollectionRepository.java | 10 +++++----- .../indicator/IndicatorCollectionRepository.java | 8 ++++---- .../IndicatorTypeCollectionRepository.java | 8 ++++---- .../legendset/LegendSetCollectionRepository.java | 6 +++--- .../maintenance/D2ErrorCollectionRepository.java | 12 ++++++------ .../ForeignKeyViolationCollectionRepository.java | 8 ++++---- .../core/option/OptionCollectionRepository.java | 8 ++++---- .../option/OptionGroupCollectionRepository.java | 6 +++--- .../core/option/OptionSetCollectionRepository.java | 8 ++++---- .../OrganisationUnitCollectionRepository.java | 10 +++++----- .../OrganisationUnitGroupCollectionRepository.java | 6 +++--- .../OrganisationUnitLevelCollectionRepository.java | 6 +++--- .../core/period/PeriodCollectionRepository.java | 10 +++++----- .../core/program/ProgramCollectionRepository.java | 12 ++++++------ .../ProgramIndicatorCollectionRepository.java | 10 +++++----- .../ProgramRuleActionCollectionRepository.java | 8 ++++---- .../program/ProgramRuleCollectionRepository.java | 8 ++++---- .../ProgramRuleVariableCollectionRepository.java | 10 +++++----- .../ProgramSectionCollectionRepository.java | 8 ++++---- .../program/ProgramStageCollectionRepository.java | 12 ++++++------ .../ProgramStageSectionsCollectionRepository.java | 8 ++++---- .../RelationshipCollectionRepository.java | 10 +++++----- .../RelationshipTypeCollectionRepository.java | 4 ++-- .../SystemSettingCollectionRepository.java | 8 ++++---- .../core/systeminfo/SystemInfoEntityDIModule.java | 2 +- .../android/core/systeminfo/SystemInfoModule.java | 2 +- .../systeminfo/SystemInfoModuleDownloader.java | 2 +- ...TrackedEntityAttributeCollectionRepository.java | 12 ++++++------ ...TrackedEntityAttributeReservedValueManager.java | 2 +- ...edEntityAttributeValueCollectionRepository.java | 8 ++++---- ...TrackedEntityDataValueCollectionRepository.java | 10 +++++----- .../TrackedEntityInstanceCollectionRepository.java | 12 ++++++------ .../TrackedEntityInstanceWithLimitCallFactory.java | 2 +- ...kedEntityTypeAttributeCollectionRepository.java | 10 +++++----- .../TrackedEntityTypeCollectionRepository.java | 4 ++-- ...kedEntityInstanceQueryCollectionRepository.java | 2 +- .../core/user/AuthorityCollectionRepository.java | 6 +++--- .../core/user/UserAuthenticateCallFactory.java | 2 +- .../core/user/UserRoleCollectionRepository.java | 4 ++-- .../core/user/UserAuthenticateCallUnitShould.java | 2 +- 83 files changed, 262 insertions(+), 262 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/CollectionRepositoryFactory.java (95%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyCollectionRepositoryImpl.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyIdentifiableCollectionRepository.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyIdentifiableCollectionRepositoryImpl.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyNameableCollectionRepository.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyNameableCollectionRepositoryImpl.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyWithDownloadObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyWithUidCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyWithUidCollectionRepositoryImpl.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadOnlyWithUploadCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadWriteCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadWriteWithUidCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadWriteWithUidCollectionRepositoryImpl.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadWriteWithUploadCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ => internal}/ReadWriteWithUploadWithUidCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/BaseFilterConnector.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/BooleanFilterConnector.java (89%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/DateFilterConnector.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/DoubleFilterConnector.java (89%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/EnumFilterConnector.java (88%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/FilterConnectorFactory.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/IdentifiableFilters.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/IntegerFilterConnector.java (89%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/NameableFilters.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/StringFilterConnector.java (88%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/{ => internal}/SubQueryFilterConnector.java (92%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java index 11ee6c8f8d..318a387467 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.data.systeminfo.SystemInfoSamples; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable; import org.hisp.dhis.android.core.utils.runner.D2JunitRunner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java similarity index 95% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java index 5c816fcd38..9ceca589ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java index 3b227be936..3540e69eea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java index f2864c0cdb..74dc1f83c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java @@ -25,13 +25,13 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryDataSource; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepository.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepository.java index f38aceacad..d758e04858 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepository.java @@ -25,9 +25,9 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; -import org.hisp.dhis.android.core.arch.repositories.filters.IdentifiableFilters; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IdentifiableFilters; import org.hisp.dhis.android.core.common.IdentifiableObject; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java index 71b056ed0e..27f1ab25f2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java @@ -25,12 +25,12 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel.Columns; import org.hisp.dhis.android.core.common.IdentifiableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepository.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepository.java index 1e4f1b6cb3..f41c4a2d21 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepository.java @@ -25,9 +25,9 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; -import org.hisp.dhis.android.core.arch.repositories.filters.NameableFilters; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.NameableFilters; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.NameableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java index cbe90fc072..00a04f2ba6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java @@ -25,11 +25,11 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseNameableObjectModel.Columns; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java index aa23f2de23..738b2530d1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java index a227d18235..d30f05825c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java index acd020f73c..b494844567 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -25,10 +25,10 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUploadCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUploadCollectionRepository.java index 2bffb32ae2..08dfa224b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUploadCollectionRepository.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.imports.DataValueImportSummary; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteCollectionRepository.java index 9d79f95c32..6a54edb2e8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java index 2916f88e5b..cd8e94a04a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java index 9ae4b86447..56e921701f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java @@ -25,12 +25,12 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import android.database.sqlite.SQLiteConstraintException; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java index 6c1c1dc84b..4da7028a2c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.imports.DataValueImportSummary; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadWithUidCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadWithUidCollectionRepository.java index 2907c7aa85..74507f88cb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadWithUidCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection; +package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BaseFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BaseFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java index 21933c665d..f96292543c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BaseFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeComplexFilterItem; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeFilterItem; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BooleanFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java similarity index 89% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BooleanFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java index 8194d36953..85732e377c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BooleanFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class BooleanFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/DateFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/DateFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java index 0f2ee93457..dbf1729e98 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/DateFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.period.DatePeriod; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/DoubleFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java similarity index 89% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/DoubleFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java index d76309d33e..7729da2ec8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/DoubleFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class DoubleFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/EnumFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java similarity index 88% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/EnumFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java index 0ed02d92cc..31cc67a6bb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/EnumFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class EnumFilterConnector, E extends Enum> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/FilterConnectorFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/FilterConnectorFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java index 9a080a34cb..33b393ddf7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/FilterConnectorFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeOrderByItem; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/IdentifiableFilters.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/IdentifiableFilters.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java index 57a4fd132b..4064d85df7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/IdentifiableFilters.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java @@ -25,9 +25,9 @@ * (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.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; public interface IdentifiableFilters> { StringFilterConnector byUid(); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/IntegerFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java similarity index 89% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/IntegerFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java index d76c98a4a6..3ebd712d52 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/IntegerFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class IntegerFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/NameableFilters.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/NameableFilters.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java index 1d88c9e3b9..3a035e3436 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/NameableFilters.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java @@ -25,9 +25,9 @@ * (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.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; public interface NameableFilters> extends IdentifiableFilters { StringFilterConnector byShortName(); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/StringFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java similarity index 88% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/StringFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java index 57e1fa1c58..83e358a9ec 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/StringFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class StringFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java index f9978ddc0d..e3b42bf268 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/SubQueryFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java @@ -26,11 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.filters; +package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.collection.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index 7f1d80c68a..1358e9574e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java index fa6ec98609..46c885542f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java index 3638fecfe3..565a7e4fe8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java index 6b00f95faf..591cf12bb9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java index 7e2adf4b68..cc600e92a2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java index 343c13fe50..0aa9c27ce5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.constant; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DoubleFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java index fb9acc9d9e..aed4c570c2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.dataelement; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java index b5e3d395a0..96d1086c63 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.period.PeriodType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java index f42b4dd437..f7d2c4a14c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java @@ -30,12 +30,12 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUploadCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.imports.DataValueImportSummary; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java index 0d44a11c3e..e8b90aa332 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java index 5dbc6a258f..2e6669031c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java @@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUploadCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java index 0d0047ae14..b901d71061 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java index 15f162c848..68f653fcff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java @@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.enrollment; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.DoubleFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java index 0e2b0a396c..54d4d58dab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUploadWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java index f49b7695ac..6589c84b62 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.data.api.OuMode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java index 7e36ba7ac1..cae6c9672e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java @@ -29,11 +29,11 @@ package org.hisp.dhis.android.core.imports; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java index 86c1235a8e..b3ba77758e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java index 8eab59c1cb..775e39af6f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java index 61f098e426..4b1cf5a987 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.legendset; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java index 84fd46b2a5..689fd7dfb8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java @@ -29,12 +29,12 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java index c8d629f805..2444311322 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java @@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java index 905e353324..537e6315c2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java index a02e71c7ab..c5f88a955c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java index dfa10708b0..6188cbe00d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java index 901a9434c9..be9864f02d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java index 594cd9775f..768e300591 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseNameableObject; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java index 1c4389bb35..f172f515ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java index 81cf6f6a2c..3af437ea42 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java @@ -29,11 +29,11 @@ package org.hisp.dhis.android.core.period; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java index 6dca635b08..46e83fbe35 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java index 42f1ab35a6..1da033ec36 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java index 97d656b41d..7c6b8bf625 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java index ec70b3431c..97c6dbc2aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java index adc7a2d3db..7ff434cced 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java index 5d5f2c0a17..119fb97a3e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java index 970cfb3061..6229c6a487 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.FormType; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java index a23b683735..d4a7224366 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java index 0cfcf93e09..6452c3660b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.relationship; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java index 0bb631e383..c59a91b616 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java index e3f237a865..b9a024177f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java @@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.settings; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java index 7c1be5b705..2860ecb56a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java index 1d585e86b6..fa9d1b7bba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java index d5e1a6f06e..0f5f34ff25 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.modules.internal.RxMetadataModuleDownloader; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java index d661bebcea..30a0adcc73 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java index 1177445df0..e589b0f72a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java @@ -30,7 +30,7 @@ import android.database.Cursor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.D2CallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java index a03f859e1f..e146dcca5b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java @@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataStatePropagator; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java index 79391894d6..927e14aefe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java @@ -29,11 +29,11 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataStatePropagator; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java index f796e1b9f0..aa28b820f7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java @@ -29,12 +29,12 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.filters.DateFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.EnumFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUploadWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java index 19269186fd..fef79d9242 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.api.OuMode; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java index 944e755e77..b193a63084 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.BooleanFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.IntegerFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.LinkModelStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java index 8e47b352f9..e930197f95 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java index bab3b6044e..0c55e1224c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java index 756453b0ea..7aa4ad3541 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.filters.StringFilterConnector; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java index 5cd5c558ba..d10945548d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java index 778cdd0ee3..751f350606 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.filters.FilterConnectorFactory; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java index 05b7d5debe..a5a13f4c25 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; From 094188e509cc8c155f0cc28d7a567ac713e2fc38 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:31:04 +0200 Subject: [PATCH 016/155] Refactor object repositories --- .../IdentifiableCollectionFiltersMockIntegrationShould.java | 2 +- ...IdentifiableCollectionRepositoryImplIntegrationShould.java | 2 +- .../collection/internal/ReadOnlyCollectionRepository.java | 2 +- .../collection/internal/ReadOnlyCollectionRepositoryImpl.java | 2 +- .../internal/ReadOnlyWithDownloadObjectRepository.java | 2 +- .../internal/ReadOnlyWithUidCollectionRepository.java | 2 +- .../internal/ReadOnlyWithUidCollectionRepositoryImpl.java | 2 +- .../internal/ReadWriteWithUidCollectionRepository.java | 2 +- .../internal/ReadWriteWithUidCollectionRepositoryImpl.java | 2 +- .../object/{ => internal}/ObjectRepositoryFactory.java | 2 +- .../ReadOnlyFirstObjectWithDownloadRepositoryImpl.java | 2 +- .../object/{ => internal}/ReadOnlyObjectRepository.java | 2 +- .../object/{ => internal}/ReadOnlyObjectRepositoryImpl.java | 2 +- .../{ => internal}/ReadOnlyOneObjectRepositoryFinalImpl.java | 2 +- .../{ => internal}/ReadOnlyOneObjectRepositoryImpl.java | 2 +- .../object/{ => internal}/ReadWriteObjectRepository.java | 2 +- .../object/{ => internal}/ReadWriteValueObjectRepository.java | 2 +- .../ReadWriteWithUidDataObjectRepositoryImpl.java | 2 +- .../{ => internal}/ReadWriteWithUidObjectRepositoryImpl.java | 2 +- .../ReadWriteWithValueObjectRepositoryImpl.java | 2 +- .../android/core/datavalue/DataValueObjectRepository.java | 4 ++-- .../android/core/enrollment/EnrollmentObjectRepository.java | 4 ++-- .../hisp/dhis/android/core/event/EventObjectRepository.java | 4 ++-- .../core/relationship/RelationshipCollectionRepository.java | 2 +- .../core/relationship/RelationshipObjectRepository.java | 4 ++-- .../core/settings/SystemSettingCollectionRepository.java | 2 +- .../android/core/systeminfo/SystemInfoObjectRepository.java | 2 +- .../TrackedEntityAttributeValueObjectRepository.java | 4 ++-- .../trackedentity/TrackedEntityDataValueObjectRepository.java | 4 ++-- .../trackedentity/TrackedEntityInstanceObjectRepository.java | 4 ++-- .../TrackedEntityInstanceQueryCollectionRepository.java | 2 +- .../android/core/user/AuthenticatedUserObjectRepository.java | 2 +- .../android/core/user/UserCredentialsObjectRepository.java | 2 +- .../org/hisp/dhis/android/core/user/UserObjectRepository.java | 2 +- 34 files changed, 41 insertions(+), 41 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ObjectRepositoryFactory.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadOnlyObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadOnlyObjectRepositoryImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadOnlyOneObjectRepositoryFinalImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadOnlyOneObjectRepositoryImpl.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadWriteObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadWriteValueObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadWriteWithUidDataObjectRepositoryImpl.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadWriteWithUidObjectRepositoryImpl.java (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ => internal}/ReadWriteWithValueObjectRepositoryImpl.java (98%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java index 2db2e158a1..b7c5da08ea 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java @@ -30,7 +30,7 @@ import com.google.common.collect.Lists; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.category.Category; import org.hisp.dhis.android.core.category.CategoryCombo; import org.hisp.dhis.android.core.category.CategoryComboCollectionRepository; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java index 3a393b7e0c..490a1f6a53 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.relationship.RelationshipType; import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java index 3540e69eea..1127f00003 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java index 74dc1f83c0..e003b65989 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryDataSource; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java index 738b2530d1..ac62c352d7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; import io.reactivex.Completable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java index d30f05825c..25ba73e53a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java index b494844567..5b608468f8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java index cd8e94a04a..4dde1833d6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java index 56e921701f..4775e86d46 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ObjectRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ObjectRepositoryFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java index 6c252cf8e5..26052c2b81 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ObjectRepositoryFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index 1358e9574e..2137e6b2c2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepository.java index f23fda2ae7..4c1286db48 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java index 321353fdce..e12b5c0b99 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryFinalImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryFinalImpl.java index a23dff90c8..063c6ac88a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryFinalImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java index caad589069..6687e4b40d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteObjectRepository.java index f153f55c06..8cb1e5190f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteObjectRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteValueObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteValueObjectRepository.java index 337944fd6b..8cd2feb938 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteValueObjectRepository.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java index 83d74d19a1..f1b05ef36c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidDataObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java index ffc659c3cc..f29d48b16c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithUidObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import android.database.sqlite.SQLiteConstraintException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java index 4f614f3e38..68a2f0eaca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteWithValueObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object; +package org.hisp.dhis.android.core.arch.repositories.object.internal; import android.database.sqlite.SQLiteConstraintException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java index 19f6c8116c..e5adc91a7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithValueObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteValueObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java index f4389f0116..d18456b9e5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.enrollment; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithUidDataObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.Coordinates; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java index 774f5f2123..4639604f3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithUidDataObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.Coordinates; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java index 6452c3660b..0dc03bb515 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java index e9d277c41f..7b399edab9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.relationship; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.StoreWithState; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java index b9a024177f..9fbc06917c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java index 5797cc31ca..b3fb8b00b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyFirstObjectWithDownloadRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyFirstObjectWithDownloadRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java index dbb9759d68..09a5d5342c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithValueObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteValueObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataStatePropagator; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java index d01620d441..28737c051d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithValueObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteValueObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataStatePropagator; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java index 636ce6228a..d1e66cd2b9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteWithUidDataObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java index 0c55e1224c..1a53ca16d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java index b63265b352..60d726b90b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java index a1b4d99c8b..60bdfc276e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java index d4f7d923a5..bbb1321051 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryImpl; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; From 15a038d8df6eea38aa350a007453e7492d33cf9e Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:48:02 +0200 Subject: [PATCH 017/155] Refactor scope package --- .../querybuilders/internal/OrderByClauseBuilder.java | 4 ++-- .../internal/ReadOnlyCollectionRepositoryImpl.java | 6 +++--- .../ReadOnlyWithUidCollectionRepositoryImpl.java | 2 +- .../filters/internal/BaseFilterConnector.java | 6 +++--- .../filters/internal/FilterConnectorFactory.java | 4 ++-- .../object/internal/ReadOnlyObjectRepositoryImpl.java | 2 +- .../internal/ReadOnlyOneObjectRepositoryImpl.java | 2 +- .../paging/{ => internal}/RepositoryDataSource.java | 4 ++-- .../paging/{ => internal}/RepositoryPagingConfig.java | 2 +- .../core/arch/repositories/scope/RepositoryScope.java | 3 +++ .../scope/{ => internal}/RepositoryMode.java | 2 +- .../RepositoryScopeComplexFilterItem.java | 4 +++- .../{ => internal}/RepositoryScopeFilterItem.java | 4 +++- .../scope/{ => internal}/RepositoryScopeHelper.java | 3 ++- .../{ => internal}/RepositoryScopeOrderByItem.java | 5 ++++- .../{ => internal}/WhereClauseFromScopeBuilder.java | 3 ++- .../enrollment/EnrollmentCollectionRepository.java | 2 +- .../android/core/event/EventCollectionRepository.java | 2 +- .../TrackedEntityInstanceCollectionRepository.java | 2 +- ...TrackedEntityInstanceQueryCollectionRepository.java | 2 +- .../search/TrackedEntityInstanceQueryDataSource.java | 6 +++--- .../TrackedEntityInstanceQueryRepositoryScope.java | 2 +- .../core/user/UserCredentialsObjectRepository.java | 2 +- .../dhis/android/core/user/UserObjectRepository.java | 2 +- .../collection/RepositoryPagingShould.java | 10 +++++----- .../scope/WhereClauseFromScopeBuilderShould.java | 2 ++ .../TrackedEntityInstanceQueryDataSourceShould.java | 6 +++--- 27 files changed, 54 insertions(+), 40 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/{ => internal}/RepositoryDataSource.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/{ => internal}/RepositoryPagingConfig.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{ => internal}/RepositoryMode.java (95%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{ => internal}/RepositoryScopeComplexFilterItem.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{ => internal}/RepositoryScopeFilterItem.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{ => internal}/RepositoryScopeHelper.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{ => internal}/RepositoryScopeOrderByItem.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{ => internal}/WhereClauseFromScopeBuilder.java (94%) diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java index 406ad91cac..3ae5d295c8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/OrderByClauseBuilder.java @@ -30,13 +30,13 @@ import android.content.ContentValues; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeOrderByItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; import org.hisp.dhis.android.core.utils.Utils; import java.util.ArrayList; import java.util.List; -import static org.hisp.dhis.android.core.arch.repositories.paging.RepositoryPagingConfig.PAGING_KEY; +import static org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingConfig.PAGING_KEY; public final class OrderByClauseBuilder { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java index e003b65989..8f2edd7357 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java @@ -33,10 +33,10 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; -import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryDataSource; +import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; -import org.hisp.dhis.android.core.arch.repositories.scope.WhereClauseFromScopeBuilder; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java index 5b608468f8..fe48a89a2d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java index f96292543c..7b6f9a9823 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java @@ -31,9 +31,9 @@ import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeComplexFilterItem; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeFilterItem; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeComplexFilterItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.utils.Utils; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java index 33b393ddf7..fc74c5cd97 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeOrderByItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; public class FilterConnectorFactory> { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java index e12b5c0b99..b1c6ef6156 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.Model; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java index 6687e4b40d..379093e204 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.WhereClauseFromScopeBuilder; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java index 4b3e9acdbf..26d494e8fc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryDataSource.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java @@ -25,14 +25,14 @@ * (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.arch.repositories.paging; +package org.hisp.dhis.android.core.arch.repositories.paging.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.WhereClauseFromScopeBuilder; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryPagingConfig.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryPagingConfig.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.java index b2544eda93..8727394463 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/RepositoryPagingConfig.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.java @@ -25,7 +25,7 @@ * (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.arch.repositories.paging; +package org.hisp.dhis.android.core.arch.repositories.paging.internal; import org.hisp.dhis.android.core.common.BaseModel; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java index 3e9c8fa46f..68027ce493 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScope.java @@ -31,6 +31,9 @@ import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeComplexFilterItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryMode.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.java similarity index 95% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryMode.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.java index 095630b18d..15db7f2089 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryMode.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.scope; +package org.hisp.dhis.android.core.arch.repositories.scope.internal; public enum RepositoryMode { ONLINE_ONLY, OFFLINE_ONLY, ONLINE_FIRST, OFFLINE_FIRST diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeComplexFilterItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeComplexFilterItem.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java index aa813d1746..f10fd84e4f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeComplexFilterItem.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java @@ -26,10 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.scope; +package org.hisp.dhis.android.core.arch.repositories.scope.internal; import com.google.auto.value.AutoValue; +import org.hisp.dhis.android.core.arch.repositories.scope.AutoValue_RepositoryScopeComplexFilterItem; + @AutoValue public abstract class RepositoryScopeComplexFilterItem { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeFilterItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeFilterItem.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java index 03adbfbad9..f12a3edbb0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeFilterItem.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java @@ -26,10 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.scope; +package org.hisp.dhis.android.core.arch.repositories.scope.internal; import com.google.auto.value.AutoValue; +import org.hisp.dhis.android.core.arch.repositories.scope.AutoValue_RepositoryScopeFilterItem; + @AutoValue public abstract class RepositoryScopeFilterItem { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeHelper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.java index 0b304499aa..6fa1de765d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.java @@ -26,8 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.scope; +package org.hisp.dhis.android.core.arch.repositories.scope.internal; +import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeOrderByItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeOrderByItem.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java index 964c74b1af..9eead89d60 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/RepositoryScopeOrderByItem.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java @@ -26,10 +26,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.scope; +package org.hisp.dhis.android.core.arch.repositories.scope.internal; import com.google.auto.value.AutoValue; +import org.hisp.dhis.android.core.arch.repositories.scope.AutoValue_RepositoryScopeOrderByItem; +import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; + @AutoValue public abstract class RepositoryScopeOrderByItem { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.java index 241e7a4ce6..22dea72354 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.java @@ -26,9 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.scope; +package org.hisp.dhis.android.core.arch.repositories.scope.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public class WhereClauseFromScopeBuilder { diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java index 68f653fcff..72459c44b7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.DataStatePropagator; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java index 54d4d58dab..d770777f9f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.DataStatePropagator; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java index aa28b820f7..c6f9beb2c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java index 1a53ca16d9..8dd6470da0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java index 9887614338..92a359099b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.java @@ -43,9 +43,9 @@ import androidx.annotation.NonNull; import androidx.paging.ItemKeyedDataSource; -import static org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode.OFFLINE_FIRST; -import static org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode.OFFLINE_ONLY; -import static org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode.ONLINE_FIRST; +import static org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode.OFFLINE_FIRST; +import static org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode.OFFLINE_ONLY; +import static org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode.ONLINE_FIRST; public final class TrackedEntityInstanceQueryDataSource extends ItemKeyedDataSource { diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java index 078d8982b3..3a338ab05b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java index 60bdfc276e..1bb77d1609 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java index bbb1321051..ddf0e7da44 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java index 28de2d5baa..227b2d7b0c 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java @@ -31,12 +31,12 @@ import android.content.ContentValues; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryDataSource; -import org.hisp.dhis.android.core.arch.repositories.paging.RepositoryPagingConfig; +import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource; +import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingConfig; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeFilterItem; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeHelper; -import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScopeOrderByItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; import org.hisp.dhis.android.core.category.CategoryOption; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java index 0b340f130b..d4d6388307 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java @@ -30,6 +30,8 @@ import org.assertj.core.util.Lists; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem; +import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java index f07d7931c3..07e17d505e 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.java @@ -45,9 +45,9 @@ import androidx.paging.ItemKeyedDataSource; -import static org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode.OFFLINE_FIRST; -import static org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode.OFFLINE_ONLY; -import static org.hisp.dhis.android.core.arch.repositories.scope.RepositoryMode.ONLINE_ONLY; +import static org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode.OFFLINE_FIRST; +import static org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode.OFFLINE_ONLY; +import static org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode.ONLINE_ONLY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; From d84d3ff9a335c25ae86318ecf1196423110f846d Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:51:00 +0200 Subject: [PATCH 018/155] Collection repository interfaces not internal --- .../SystemInfoCallMockIntegrationShould.java | 2 +- .../ReadOnlyCollectionRepository.java | 2 +- ...dOnlyIdentifiableCollectionRepository.java | 2 +- .../ReadOnlyNameableCollectionRepository.java | 2 +- .../ReadOnlyWithDownloadObjectRepository.java | 2 +- .../ReadOnlyWithUidCollectionRepository.java | 2 +- ...eadOnlyWithUploadCollectionRepository.java | 2 +- .../ReadWriteCollectionRepository.java | 2 +- .../ReadWriteWithUidCollectionRepository.java | 2 +- ...WithUploadWithUidCollectionRepository.java | 2 +- .../internal/CollectionRepositoryFactory.java | 1 + .../ReadOnlyCollectionRepositoryImpl.java | 1 + ...yIdentifiableCollectionRepositoryImpl.java | 2 + ...dOnlyNameableCollectionRepositoryImpl.java | 2 + ...adOnlyWithUidCollectionRepositoryImpl.java | 2 + ...dWriteWithUidCollectionRepositoryImpl.java | 2 + ...adWriteWithUploadCollectionRepository.java | 38 ------------------- .../filters/internal/BaseFilterConnector.java | 2 +- .../internal/BooleanFilterConnector.java | 2 +- .../filters/internal/DateFilterConnector.java | 2 +- .../internal/DoubleFilterConnector.java | 2 +- .../filters/internal/EnumFilterConnector.java | 2 +- .../internal/FilterConnectorFactory.java | 2 +- .../filters/internal/IdentifiableFilters.java | 2 +- .../internal/IntegerFilterConnector.java | 2 +- .../filters/internal/NameableFilters.java | 2 +- .../internal/StringFilterConnector.java | 2 +- .../internal/SubQueryFilterConnector.java | 2 +- ...FirstObjectWithDownloadRepositoryImpl.java | 2 +- ...pleteRegistrationCollectionRepository.java | 4 +- .../DataValueCollectionRepository.java | 2 +- .../aggregated/data/AggregatedDataCall.java | 2 +- .../core/event/EventCollectionRepository.java | 2 +- .../core/event/EventWithLimitCallFactory.java | 2 +- .../RelationshipCollectionRepository.java | 2 +- .../systeminfo/SystemInfoEntityDIModule.java | 2 +- .../core/systeminfo/SystemInfoModule.java | 2 +- .../SystemInfoModuleDownloader.java | 2 +- ...edEntityAttributeReservedValueManager.java | 2 +- ...kedEntityInstanceCollectionRepository.java | 2 +- ...kedEntityInstanceWithLimitCallFactory.java | 2 +- ...tityInstanceQueryCollectionRepository.java | 2 +- .../user/UserAuthenticateCallFactory.java | 2 +- .../user/UserAuthenticateCallUnitShould.java | 2 +- 44 files changed, 48 insertions(+), 76 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadOnlyCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadOnlyIdentifiableCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadOnlyNameableCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadOnlyWithDownloadObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadOnlyWithUidCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadOnlyWithUploadCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadWriteCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadWriteWithUidCollectionRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{internal => }/ReadWriteWithUploadWithUidCollectionRepository.java (96%) delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java index 318a387467..11ee6c8f8d 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.data.systeminfo.SystemInfoSamples; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable; import org.hisp.dhis.android.core.utils.runner.D2JunitRunner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java index 1127f00003..d7b40455b7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java index d758e04858..bb04588d54 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.repositories.filters.internal.IdentifiableFilters; import org.hisp.dhis.android.core.common.IdentifiableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java index f41c4a2d21..428606c5d7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.repositories.filters.internal.NameableFilters; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java index ac62c352d7..b8dbda337b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithDownloadObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java index 25ba73e53a..f894b3cfb5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUploadCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUploadCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java index 08dfa224b0..2bffb32ae2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUploadCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.imports.DataValueImportSummary; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java index 6a54edb2e8..9d79f95c32 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java index 4dde1833d6..d82f51c6c7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadWithUidCollectionRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java index 74507f88cb..2907c7aa85 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.collection.internal; +package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java index 9ceca589ef..25e4d57409 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/CollectionRepositoryFactory.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection.internal; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public interface CollectionRepositoryFactory> { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java index 8f2edd7357..afbebccc3b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java @@ -31,6 +31,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java index 27f1ab25f2..4250a99c8f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java @@ -28,6 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java index 00a04f2ba6..1a4cad8d57 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java @@ -28,6 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java index fe48a89a2d..2d82654076 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -28,6 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.collection.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java index 4775e86d46..52c8fa5fce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java @@ -30,6 +30,8 @@ import android.database.sqlite.SQLiteConstraintException; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java deleted file mode 100644 index 4da7028a2c..0000000000 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUploadCollectionRepository.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2004-2019, 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.arch.repositories.collection.internal; - -import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.imports.DataValueImportSummary; -import org.hisp.dhis.android.core.maintenance.D2Error; - -import java.util.concurrent.Callable; - -public interface ReadWriteWithUploadCollectionRepository extends ReadWriteCollectionRepository { - Callable upload() throws D2Error; -} \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java index 7b6f9a9823..20f0ba3654 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeComplexFilterItem; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java index 85732e377c..27f5d1abac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class BooleanFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java index dbf1729e98..6a6e1e83d6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.period.DatePeriod; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java index 7729da2ec8..7131e3f1ce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class DoubleFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java index 31cc67a6bb..fc988c2bdc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class EnumFilterConnector, E extends Enum> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java index fc74c5cd97..6327d50b41 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java index 4064d85df7..7252a13a39 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; public interface IdentifiableFilters> { StringFilterConnector byUid(); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java index 3ebd712d52..32ac5857ce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class IntegerFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java index 3a035e3436..8a4f484d59 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; public interface NameableFilters> extends IdentifiableFilters { StringFilterConnector byShortName(); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java index 83e358a9ec..93c2c158e8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class StringFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java index e3b42bf268..bc31d9c502 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index 2137e6b2c2..b4855c8830 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java index f7d2c4a14c..d6139d9da1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUploadCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java index 2e6669031c..ea445c0c7b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUploadCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java index b901d71061..0d0047ae14 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java index d770777f9f..fca445b7da 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUploadWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java index 6589c84b62..f49b7695ac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventWithLimitCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.data.api.OuMode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java index 0dc03bb515..91172bbc57 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java index 2860ecb56a..7c1be5b705 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java index fa9d1b7bba..1d585e86b6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java index 0f5f34ff25..d5e1a6f06e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleDownloader.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.systeminfo; import org.hisp.dhis.android.core.arch.modules.internal.RxMetadataModuleDownloader; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java index e589b0f72a..1177445df0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java @@ -30,7 +30,7 @@ import android.database.Cursor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.D2CallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java index c6f9beb2c0..4ba666298d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUploadWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java index fef79d9242..19269186fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.LinkModelStore; import org.hisp.dhis.android.core.data.api.OuMode; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java index 8dd6470da0..14b13974ca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java index d10945548d..5cd5c558ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java index a5a13f4c25..05b7d5debe 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; From 6d7eac84345007fd57d8dbe5c7011ab58b1c9a29 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 16:53:13 +0200 Subject: [PATCH 019/155] Object repository interfaces not internal --- .../IdentifiableCollectionFiltersMockIntegrationShould.java | 2 +- ...yIdentifiableCollectionRepositoryImplIntegrationShould.java | 2 +- .../repositories/collection/ReadOnlyCollectionRepository.java | 2 +- .../collection/ReadOnlyWithDownloadObjectRepository.java | 2 +- .../collection/ReadOnlyWithUidCollectionRepository.java | 2 +- .../collection/ReadWriteWithUidCollectionRepository.java | 2 +- .../collection/internal/ReadOnlyCollectionRepositoryImpl.java | 2 +- .../internal/ReadOnlyWithUidCollectionRepositoryImpl.java | 2 +- .../internal/ReadWriteWithUidCollectionRepositoryImpl.java | 2 +- .../object/{internal => }/ReadOnlyObjectRepository.java | 2 +- .../{internal => }/ReadOnlyOneObjectRepositoryFinalImpl.java | 3 ++- .../object/{internal => }/ReadWriteObjectRepository.java | 2 +- .../object/{internal => }/ReadWriteValueObjectRepository.java | 2 +- .../repositories/object/internal/ObjectRepositoryFactory.java | 1 + .../ReadOnlyFirstObjectWithDownloadRepositoryImpl.java | 1 + .../object/internal/ReadOnlyObjectRepositoryImpl.java | 1 + .../object/internal/ReadOnlyOneObjectRepositoryImpl.java | 1 + .../internal/ReadWriteWithUidDataObjectRepositoryImpl.java | 1 + .../object/internal/ReadWriteWithUidObjectRepositoryImpl.java | 1 + .../internal/ReadWriteWithValueObjectRepositoryImpl.java | 1 + .../dhis/android/core/datavalue/DataValueObjectRepository.java | 2 +- .../android/core/enrollment/EnrollmentObjectRepository.java | 2 +- .../hisp/dhis/android/core/event/EventObjectRepository.java | 2 +- .../core/relationship/RelationshipCollectionRepository.java | 2 +- .../core/relationship/RelationshipObjectRepository.java | 2 +- .../core/settings/SystemSettingCollectionRepository.java | 2 +- .../TrackedEntityAttributeValueObjectRepository.java | 2 +- .../trackedentity/TrackedEntityDataValueObjectRepository.java | 2 +- .../trackedentity/TrackedEntityInstanceObjectRepository.java | 2 +- .../search/TrackedEntityInstanceQueryCollectionRepository.java | 2 +- 30 files changed, 31 insertions(+), 23 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{internal => }/ReadOnlyObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{internal => }/ReadOnlyOneObjectRepositoryFinalImpl.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{internal => }/ReadWriteObjectRepository.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{internal => }/ReadWriteValueObjectRepository.java (96%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java index b7c5da08ea..2db2e158a1 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/IdentifiableCollectionFiltersMockIntegrationShould.java @@ -30,7 +30,7 @@ import com.google.common.collect.Lists; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.category.Category; import org.hisp.dhis.android.core.category.CategoryCombo; import org.hisp.dhis.android.core.category.CategoryComboCollectionRepository; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java index 490a1f6a53..3a393b7e0c 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.relationship.RelationshipType; import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java index d7b40455b7..3b227be936 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java index b8dbda337b..aa23f2de23 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; import io.reactivex.Completable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java index f894b3cfb5..a227d18235 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java index d82f51c6c7..2916f88e5b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java index afbebccc3b..d892470fa2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java index 2d82654076..f7af0303cc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java index 52c8fa5fce..0443325f8c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java index 4c1286db48..f23fda2ae7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object.internal; +package org.hisp.dhis.android.core.arch.repositories.object; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryFinalImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryFinalImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java index 063c6ac88a..0dd0bd81f0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryFinalImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java @@ -25,9 +25,10 @@ * (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.arch.repositories.object.internal; +package org.hisp.dhis.android.core.arch.repositories.object; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java index 8cb1e5190f..f153f55c06 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java @@ -25,7 +25,7 @@ * (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.arch.repositories.object.internal; +package org.hisp.dhis.android.core.arch.repositories.object; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteValueObjectRepository.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java index 8cd2feb938..337944fd6b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.arch.repositories.object.internal; +package org.hisp.dhis.android.core.arch.repositories.object; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java index 26052c2b81..1bd650ddec 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.object.internal; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public interface ObjectRepositoryFactory> { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index b4855c8830..c83559fb12 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -30,6 +30,7 @@ import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java index b1c6ef6156..3e7716052c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java @@ -29,6 +29,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java index 379093e204..067afd4793 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java @@ -29,6 +29,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java index f1b05ef36c..f860ace4c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataModel; import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java index f29d48b16c..db79664052 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java @@ -30,6 +30,7 @@ import android.database.sqlite.SQLiteConstraintException; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java index 68a2f0eaca..e9c82655c4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java @@ -30,6 +30,7 @@ import android.database.sqlite.SQLiteConstraintException; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java index e5adc91a7e..ca1af8a76e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteValueObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java index d18456b9e5..bbd11cb51c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.enrollment; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java index 4639604f3f..9fea6cbe5c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java index 91172bbc57..ea316ddfb1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java index 7b399edab9..61a0611782 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.StoreWithState; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java index 9fbc06917c..b9a024177f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryFinalImpl; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java index 09a5d5342c..a24f799b9a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteValueObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataStatePropagator; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java index 28737c051d..243a98920d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteValueObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataStatePropagator; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java index d1e66cd2b9..568018ebb5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java index 14b13974ca..ce1c274192 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; -import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyObjectRepository; +import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; From 2624a80981e84d99b048c086546bd1d901f2d4a8 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 17:01:47 +0200 Subject: [PATCH 020/155] [ANDROSDK-850] Optimize imports --- .../dhis/android/core/arch/api/internal/APIClientDIModule.java | 2 -- .../android/core/arch/api/internal/RxAPICallExecutorImpl.java | 2 +- .../stores/binders/internal/IdentifiableStatementBinder.java | 3 ++- .../db/stores/binders/internal/NameableStatementBinder.java | 3 ++- .../core/arch/db/stores/binders/internal/StatementBinder.java | 1 + .../repositories/filters/internal/BaseFilterConnector.java | 2 +- .../repositories/filters/internal/BooleanFilterConnector.java | 2 +- .../repositories/filters/internal/DateFilterConnector.java | 2 +- .../repositories/filters/internal/DoubleFilterConnector.java | 2 +- .../repositories/filters/internal/EnumFilterConnector.java | 2 +- .../repositories/filters/internal/FilterConnectorFactory.java | 2 +- .../repositories/filters/internal/IntegerFilterConnector.java | 2 +- .../repositories/filters/internal/StringFilterConnector.java | 2 +- .../repositories/filters/internal/SubQueryFilterConnector.java | 2 +- .../scope/internal/RepositoryScopeComplexFilterItem.java | 2 -- .../repositories/scope/internal/RepositoryScopeFilterItem.java | 2 -- .../scope/internal/RepositoryScopeOrderByItem.java | 1 - 17 files changed, 15 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java index e385034047..76f1587636 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.arch.api.internal; -import org.hisp.dhis.android.core.arch.api.internal.APIExecutorsDIModule; - import dagger.Module; import dagger.Provides; import retrofit2.Retrofit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java index 79e035084b..deaf963d3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; -import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; import org.hisp.dhis.android.core.arch.call.D2Progress; +import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; import org.hisp.dhis.android.core.common.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java index 06590f5ffb..f147829b2a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/IdentifiableStatementBinder.java @@ -29,10 +29,11 @@ package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.common.IdentifiableObject; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public abstract class IdentifiableStatementBinder implements StatementBinder { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java index b2d402c58f..29167ba077 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/NameableStatementBinder.java @@ -29,10 +29,11 @@ package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.common.NameableObject; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public abstract class NameableStatementBinder extends IdentifiableStatementBinder { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java index 3946afab0b..63fa536f7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java @@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.arch.db.stores.binders.internal; import android.database.sqlite.SQLiteStatement; + import androidx.annotation.NonNull; public interface StatementBinder { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java index 20f0ba3654..b60b046aaa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeComplexFilterItem; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java index 27f5d1abac..223674da33 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class BooleanFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java index 6a6e1e83d6..275e980923 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.period.DatePeriod; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java index 7131e3f1ce..799a49633d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class DoubleFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java index fc988c2bdc..a95aef61ff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class EnumFilterConnector, E extends Enum> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java index 6327d50b41..d147cb7c5f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java index 32ac5857ce..6ecc2727fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class IntegerFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java index 93c2c158e8..190b283521 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; public final class StringFilterConnector> diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java index bc31d9c502..19bec95465 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.CollectionRepositoryFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java index f10fd84e4f..5511aca8ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeComplexFilterItem.java @@ -30,8 +30,6 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.arch.repositories.scope.AutoValue_RepositoryScopeComplexFilterItem; - @AutoValue public abstract class RepositoryScopeComplexFilterItem { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java index f12a3edbb0..91b9e7bac8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeFilterItem.java @@ -30,8 +30,6 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.arch.repositories.scope.AutoValue_RepositoryScopeFilterItem; - @AutoValue public abstract class RepositoryScopeFilterItem { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java index 9eead89d60..42afef7891 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java @@ -30,7 +30,6 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.arch.repositories.scope.AutoValue_RepositoryScopeOrderByItem; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; @AutoValue From 067e37da267eef721c0a28fad278c03321d61808 Mon Sep 17 00:00:00 2001 From: Pawel Szymanski Date: Fri, 31 May 2019 18:23:49 +0200 Subject: [PATCH 021/155] Warnings fixes --- .../core/sms/data/DeviceStateRepositoryImpl.java | 12 +++++++----- .../localdbrepository/OngoingSubmissionsStore.java | 13 ++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/DeviceStateRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/DeviceStateRepositoryImpl.java index a1ae444271..a42daadcce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/DeviceStateRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/DeviceStateRepositoryImpl.java @@ -10,12 +10,12 @@ import android.telephony.TelephonyManager; import org.hisp.dhis.android.core.sms.domain.repository.DeviceStateRepository; -import org.reactivestreams.Publisher; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.Single; +import io.reactivex.SingleOnSubscribe; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -44,18 +44,20 @@ public Single isNetworkConnected() { // When failed to get current status or too low sdk version // Have to register listener AtomicReference listener = new AtomicReference<>(); - return Single.fromPublisher((Publisher) s -> { + return Single.create((SingleOnSubscribe) emitter -> { + if (emitter.isDisposed()) { + return; + } // Set a listener on a telephony manager to get listener.set(new PhoneStateListener() { @Override public void onServiceStateChanged(ServiceState serviceState) { - if (listener.get() == null) { + if (listener.get() == null || emitter.isDisposed()) { return; } - s.onNext(serviceState.getState() == ServiceState.STATE_IN_SERVICE); telephonyManager.listen(listener.get(), PhoneStateListener.LISTEN_NONE); listener.set(null); - s.onComplete(); + emitter.onSuccess(serviceState.getState() == ServiceState.STATE_IN_SERVICE); } }); telephonyManager.listen(listener.get(), PhoneStateListener.LISTEN_SERVICE_STATE); diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java index f1cb89b3b0..b8038c4337 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/OngoingSubmissionsStore.java @@ -38,11 +38,13 @@ Single> getOngoingSubmissions() { } Type mapType = new TypeToken>() { }.getType(); - return new GsonBuilder().create().fromJson( - new InputStreamReader( - context.openFileInput(ONGOING_SUBMISSIONS_FILE), - StandardCharsets.UTF_8), - mapType); + InputStreamReader reader = new InputStreamReader( + context.openFileInput(ONGOING_SUBMISSIONS_FILE), + StandardCharsets.UTF_8); + Map submissions = + new GsonBuilder().create().fromJson(reader, mapType); + reader.close(); + return submissions; }).onErrorReturn(throwable -> { Log.e(TAG, throwable.getMessage(), throwable); return new HashMap<>(); @@ -83,6 +85,7 @@ private Completable saveOngoingSubmissions(Map Date: Mon, 3 Jun 2019 13:28:25 +0200 Subject: [PATCH 022/155] [ANDROSDK-848] Add DataSetValueSummaryStore --- .../core/datavalue/DataSetValueSummary.java | 9 +- .../datavalue/DataSetValueSummaryStore.java | 118 ++++++++++++++++++ .../android/core/period/PeriodTableInfo.java | 4 +- 3 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummaryStore.java diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java index 2ba32cdf41..6ea763b153 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummary.java @@ -31,6 +31,8 @@ import android.database.Cursor; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.google.auto.value.AutoValue; @@ -40,6 +42,9 @@ @AutoValue public abstract class DataSetValueSummary { + @NonNull + public abstract String dataSet(); + @NonNull public abstract String period(); @@ -49,7 +54,7 @@ public abstract class DataSetValueSummary { @NonNull public abstract String attributeOptionCombo(); - @NonNull + @Nullable @ColumnAdapter(DbStateColumnAdapter.class) public abstract State state(); @@ -67,6 +72,8 @@ public static DataSetValueSummary.Builder builder() { @AutoValue.Builder public abstract static class Builder { + public abstract Builder dataSet(String dataSet); + public abstract Builder period(String period); public abstract Builder organisationUnit(String organisationUnit); diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummaryStore.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummaryStore.java new file mode 100644 index 0000000000..bcaaab7275 --- /dev/null +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataSetValueSummaryStore.java @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2004-2019, 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.datavalue; + +import android.database.Cursor; + +import org.hisp.dhis.android.core.common.BaseDataModel; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.State; +import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import org.hisp.dhis.android.core.dataset.DataSetDataElementLinkTableInfo; +import org.hisp.dhis.android.core.period.PeriodTableInfo; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class DataSetValueSummaryStore { + + private final DatabaseAdapter databaseAdapter; + private final CursorModelFactory modelFactory; + + private final String DATAVALUE_ALIAS = "dv"; + private final String PERIOD_ALIAS = "pe"; + private final String DATASETELEMENT_ALIAS = "dse"; + private final String DATASET_ALIAS = "ds"; + + private final String STATE = DATAVALUE_ALIAS + "." + BaseDataModel.Columns.STATE; + + private final String SELECT_STATE_ORDERING = " MAX(CASE " + + "WHEN " + STATE + " = '" + State.SYNCED + "' THEN 1 " + + "WHEN " + STATE + " = '" + State.TO_DELETE + "' THEN 2 " + + "WHEN " + STATE + " IN ('" + State.TO_POST + "','" + State.TO_UPDATE + "') THEN 3 " + + "ELSE 4 END)"; + + private final String SELECT = "SELECT " + + DATASETELEMENT_ALIAS + "." + DataSetDataElementLinkTableInfo.Columns.DATA_SET + ", " + + DATAVALUE_ALIAS + "." + DataValueFields.PERIOD + ", " + + DATAVALUE_ALIAS + "." + DataValueTableInfo.ORGANISATION_UNIT + ", " + + DATAVALUE_ALIAS + "." + DataValueFields.ATTRIBUTE_OPTION_COMBO + ", " + + STATE + ", " + + // Auxiliary field to order the 'state' column and to prioritize TO_POST and TO_UPDATE + SELECT_STATE_ORDERING + " " + + + "FROM " + DataValueTableInfo.TABLE_INFO.name() + " as " + DATAVALUE_ALIAS + + " INNER JOIN " + PeriodTableInfo.TABLE_INFO.name() + " as " + PERIOD_ALIAS + + " ON " + DATAVALUE_ALIAS + "." + DataValueFields.PERIOD + " = " + PERIOD_ALIAS + "." + PeriodTableInfo.Columns.PERIOD_ID + + " INNER JOIN " + DataSetDataElementLinkTableInfo.TABLE_INFO.name() + " as " + DATASETELEMENT_ALIAS + + " ON " + DATAVALUE_ALIAS + "." + DataValueFields.DATA_ELEMENT + " = " + DATASETELEMENT_ALIAS + "." + DataSetDataElementLinkTableInfo.Columns.DATA_ELEMENT; + + private final String GROUP_BY_CLAUSE = " GROUP BY " + + DATASETELEMENT_ALIAS + "." + DataSetDataElementLinkTableInfo.Columns.DATA_SET + "," + + DATAVALUE_ALIAS + "." + DataValueFields.PERIOD + "," + + DATAVALUE_ALIAS + "." + DataValueTableInfo.ORGANISATION_UNIT + "," + + DATAVALUE_ALIAS + "." + DataValueFields.ATTRIBUTE_OPTION_COMBO; + + private final String WHERE_CLAUSE = " WHERE dv.period = '201806' and dse.dataSet = " + + "'Zi5D24rZvYd' "; + + private DataSetValueSummaryStore(DatabaseAdapter databaseAdapter, + CursorModelFactory modelFactory) { + this.databaseAdapter = databaseAdapter; + this.modelFactory = modelFactory; + } + + public List query(String whereClause) { + String query = SELECT + WHERE_CLAUSE + GROUP_BY_CLAUSE; + List result = new ArrayList<>(); + addObjectsToCollection(databaseAdapter.query(query), result); + + return result; + } + + private void addObjectsToCollection(Cursor cursor, + Collection collection) { + try { + if (cursor.getCount() > 0) { + cursor.moveToFirst(); + do { + collection.add(modelFactory.fromCursor(cursor)); + } + while (cursor.moveToNext()); + } + } finally { + cursor.close(); + } + } + + public static DataSetValueSummaryStore create(DatabaseAdapter databaseAdapter) { + return new DataSetValueSummaryStore(databaseAdapter, DataSetValueSummary::create); + } +} diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java index cb26539b4c..7a039e8fa9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodTableInfo.java @@ -50,8 +50,8 @@ public BaseModel.Columns columns() { } }; - static class Columns extends BaseModel.Columns { - static final String PERIOD_ID = "periodId"; + public static class Columns extends BaseModel.Columns { + public static final String PERIOD_ID = "periodId"; static final String PERIOD_TYPE = "periodType"; static final String START_DATE = "startDate"; static final String END_DATE = "endDate"; From b31ace468ce1c1eba13e193f199d0b4344a2dac7 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 17:44:28 +0200 Subject: [PATCH 023/155] Move stores to arch --- .../PagingMockIntegrationShould.java | 2 +- .../CategoryCategoryComboLinkStoreShould.java | 4 +-- ...CategoryCategoryOptionLinkStoreShould.java | 4 +-- ...omboEndpointCallRealIntegrationShould.java | 4 +-- ...ntifiableObjectStoreIntegrationShould.java | 1 + .../common/ObjectStoreIntegrationShould.java | 1 + ...aObjectStoreAbstractIntegrationShould.java | 2 +- ...eObjectStoreAbstractIntegrationShould.java | 2 +- ...nkModelStoreAbstractIntegrationShould.java | 2 +- .../ObjectStoreAbstractIntegrationShould.java | 2 +- ...houtUidStoreAbstractIntegrationShould.java | 2 +- .../NotePostCallRealIntegrationShould.java | 2 +- .../maintenance/ForeignKeyCleanerShould.java | 2 +- ...nisationUnitCallMockIntegrationShould.java | 2 +- ...rvedValueManagerRealIntegrationShould.java | 2 +- ...teReservedValueStoreIntegrationShould.java | 2 +- .../user/LogoutCallRealIntegrationShould.java | 2 +- ...BaseMockIntegrationTestFullDispatcher.java | 2 +- ...ogramIndicatorEngineIntegrationShould.java | 2 +- .../hisp/dhis/android/core/D2DIComponent.java | 2 +- .../api/internal/APICallExecutorImpl.java | 2 +- .../api/internal/RxAPICallExecutorImpl.java | 2 +- .../internal}/SQLStatementBuilder.java | 34 +++++++++++-------- .../internal}/SQLStatementWrapper.java | 7 ++-- .../internal}/IdentifiableObjectStore.java | 7 ++-- .../IdentifiableObjectStoreImpl.java | 11 ++++-- .../IdentifiableObjectWithStateStore.java | 5 ++- .../IdentifiableObjectWithStateStoreImpl.java | 9 ++++- .../internal/LinkModelChildStoreImpl.java | 6 ++-- .../db/stores/internal}/LinkModelStore.java | 4 ++- .../stores/internal}/LinkModelStoreImpl.java | 8 +++-- .../db/stores/internal}/ObjectStore.java | 5 ++- .../db/stores/internal}/ObjectStoreImpl.java | 7 +++- .../internal/ObjectWithUidChildStoreImpl.java | 6 ++-- .../internal}/ObjectWithoutUidStore.java | 4 ++- .../internal}/ObjectWithoutUidStoreImpl.java | 6 +++- .../internal/SingleParentChildStoreImpl.java | 6 ++-- .../db/stores/internal}/StoreFactory.java | 23 ++++++------- .../internal/IdentifiableEntityDIModule.java | 2 +- .../internal/IdentifiableStoreProvider.java | 2 +- .../ObjectWithoutUidEntityDIModule.java | 2 +- .../ObjectWithoutUidStoreProvider.java | 2 +- .../IdentifiableDataSyncHandlerImpl.java | 2 +- .../internal/IdentifiableSyncHandlerImpl.java | 2 +- .../internal/LinkSyncHandlerImpl.java | 2 +- .../ObjectWithoutUidSyncHandlerImpl.java | 2 +- .../ReadOnlyCollectionRepositoryImpl.java | 2 +- ...yIdentifiableCollectionRepositoryImpl.java | 2 +- ...dOnlyNameableCollectionRepositoryImpl.java | 2 +- ...adOnlyWithUidCollectionRepositoryImpl.java | 2 +- ...dWriteWithUidCollectionRepositoryImpl.java | 2 +- .../ReadOnlyOneObjectRepositoryFinalImpl.java | 2 +- ...FirstObjectWithDownloadRepositoryImpl.java | 2 +- .../ReadOnlyOneObjectRepositoryImpl.java | 2 +- ...dWriteWithUidDataObjectRepositoryImpl.java | 2 +- .../ReadWriteWithUidObjectRepositoryImpl.java | 2 +- ...eadWriteWithValueObjectRepositoryImpl.java | 2 +- .../paging/internal/RepositoryDataSource.java | 2 +- .../dhis/android/core/calls/EndpointCall.java | 4 +-- .../dhis/android/core/calls/MetadataCall.java | 3 +- ...CategoryCategoryComboChildrenAppender.java | 2 +- .../CategoryCategoryComboEntityDIModule.java | 2 +- .../CategoryCategoryComboLinkStore.java | 4 +-- ...ategoryCategoryOptionChildrenAppender.java | 2 +- .../CategoryCategoryOptionEntityDIModule.java | 2 +- .../CategoryCategoryOptionLinkStore.java | 4 +-- .../CategoryCollectionRepository.java | 2 +- .../CategoryComboCollectionRepository.java | 2 +- .../category/CategoryComboEntityDIModule.java | 2 +- .../core/category/CategoryComboHandler.java | 2 +- .../core/category/CategoryComboStore.java | 4 +-- .../core/category/CategoryEntityDIModule.java | 2 +- .../core/category/CategoryHandler.java | 2 +- .../CategoryOptionCollectionRepository.java | 2 +- ...onComboCategoryOptionChildrenAppender.java | 2 +- ...tionComboCategoryOptionEntityDIModule.java | 2 +- ...oryOptionComboCategoryOptionLinkStore.java | 4 +-- .../category/CategoryOptionComboStore.java | 2 +- .../CategoryOptionComboStoreImpl.java | 6 ++-- .../CategoryOptionEntityDIModule.java | 2 +- .../core/category/CategoryOptionStore.java | 4 +-- .../android/core/category/CategoryStore.java | 4 +-- .../hisp/dhis/android/core/common/Access.java | 4 +-- .../common/AggregationTypeColumnAdapter.java | 4 +-- .../android/core/common/BaseDataModel.java | 4 +-- .../common/BaseIdentifiableDataModel.java | 4 +-- .../common/BaseIdentifiableObjectModel.java | 4 +-- .../core/common/BaseNameableObject.java | 4 +-- .../core/common/BaseNameableObjectModel.java | 4 +-- .../dhis/android/core/common/Coordinates.java | 4 +-- .../android/core/common/D2CallExecutor.java | 1 + .../dhis/android/core/common/DataAccess.java | 4 +-- .../core/common/LinkModelHandlerImpl.java | 2 ++ .../hisp/dhis/android/core/common/Model.java | 3 +- .../common/ObjectStyleEntityDIModule.java | 1 + .../core/common/ObjectStyleHandlerImpl.java | 1 + .../android/core/common/ObjectStyleModel.java | 3 +- .../android/core/common/ObjectStyleStore.java | 1 + .../core/common/ObjectStyleStoreImpl.java | 4 ++- .../android/core/common/ObjectWithStyle.java | 4 +-- .../android/core/common/ObjectWithUid.java | 4 +-- .../common/OrderedLinkSyncHandlerImpl.java | 2 ++ .../android/core/common/SafeDateFormat.java | 4 +-- .../core/common/ValueTypeDeviceRendering.java | 3 +- ...alueTypeDeviceRenderingEntityDIModule.java | 1 + .../common/ValueTypeDeviceRenderingModel.java | 3 +- .../common/ValueTypeDeviceRenderingStore.java | 2 ++ .../core/common/ValueTypeRendering.java | 4 +-- .../configuration/ConfigurationStore.java | 2 +- .../configuration/ConfigurationStoreImpl.java | 4 +-- .../ConstantCollectionRepository.java | 2 +- .../core/constant/ConstantHandler.java | 2 +- .../constant/ConstantPackageDIModule.java | 2 +- .../android/core/constant/ConstantStore.java | 4 +-- .../core/data/api/BasicAuthenticator.java | 2 +- .../data/api/BasicAuthenticatorFactory.java | 2 +- .../DataApprovalEntityDIModule.java | 2 +- .../core/dataapproval/DataApprovalStore.java | 4 +-- .../DataElementCollectionRepository.java | 2 +- .../DataElementEntityDIModule.java | 2 +- .../core/dataelement/DataElementHandler.java | 2 +- .../DataElementOperandEntityDIModule.java | 2 +- .../dataelement/DataElementOperandStore.java | 4 +-- .../core/dataelement/DataElementStore.java | 4 +-- .../android/core/dataset/DataInputPeriod.java | 5 +-- .../DataInputPeriodChildrenAppender.java | 2 +- .../DataInputPeriodEntityDIModule.java | 2 +- .../dataset/DataInputPeriodLinkStore.java | 4 +-- .../core/dataset/DataInputPeriodModel.java | 3 +- .../dhis/android/core/dataset/DataSet.java | 3 +- .../dataset/DataSetCollectionRepository.java | 2 +- .../dataset/DataSetCompleteRegistration.java | 5 +-- ...ataSetCompleteRegistrationCallFetcher.java | 4 +-- ...pleteRegistrationCollectionRepository.java | 2 +- .../DataSetCompleteRegistrationStore.java | 2 +- .../DataSetCompleteRegistrationStoreImpl.java | 4 +-- ...oryDataElementOperandChildrenAppender.java | 2 +- ...lsoryDataElementOperandEntityDIModule.java | 2 +- ...taSetCompulsoryDataElementOperandLink.java | 3 +- ...CompulsoryDataElementOperandLinkModel.java | 3 +- ...CompulsoryDataElementOperandLinkStore.java | 4 +-- ...ulsoryDataElementOperandLinkTableInfo.java | 2 +- .../dataset/DataSetDataElementLinkModel.java | 3 +- .../dataset/DataSetDataElementLinkStore.java | 4 +-- .../DataSetDataElementLinkTableInfo.java | 4 +-- .../android/core/dataset/DataSetElement.java | 5 +-- .../DataSetElementChildrenAppender.java | 2 +- .../dataset/DataSetElementEntityDIModule.java | 2 +- .../dataset/DataSetElementLinkTableInfo.java | 2 +- .../core/dataset/DataSetEntityDIModule.java | 2 +- .../android/core/dataset/DataSetHandler.java | 2 +- .../android/core/dataset/DataSetModel.java | 3 +- .../dataset/DataSetOrganisationUnitLink.java | 3 +- .../DataSetOrganisationUnitLinkModel.java | 3 +- .../DataSetOrganisationUnitLinkStore.java | 4 +-- .../DataSetOrganisationUnitLinkTableInfo.java | 2 +- .../android/core/dataset/DataSetStore.java | 7 ++-- .../dhis/android/core/dataset/Section.java | 3 +- .../core/dataset/SectionChildrenAppender.java | 2 +- .../dataset/SectionCollectionRepository.java | 2 +- .../SectionDataElementChildrenAppender.java | 2 +- .../SectionDataElementEntityDIModule.java | 2 +- .../core/dataset/SectionDataElementLink.java | 3 +- .../dataset/SectionDataElementLinkModel.java | 3 +- .../dataset/SectionDataElementLinkStore.java | 4 +-- .../SectionDataElementLinkTableInfo.java | 2 +- .../core/dataset/SectionEntityDIModule.java | 2 +- .../SectionGreyedFieldsChildrenAppender.java | 2 +- .../SectionGreyedFieldsEntityDIModule.java | 2 +- .../core/dataset/SectionGreyedFieldsLink.java | 3 +- .../dataset/SectionGreyedFieldsLinkModel.java | 3 +- .../dataset/SectionGreyedFieldsLinkStore.java | 4 +-- .../SectionGreyedFieldsLinkTableInfo.java | 2 +- .../android/core/dataset/SectionHandler.java | 2 +- .../android/core/dataset/SectionModel.java | 3 +- .../android/core/dataset/SectionStore.java | 7 ++-- .../core/datavalue/DataValueStore.java | 4 +-- .../aggregated/data/AggregatedDataCall.java | 2 +- .../EnrollmentChildrenAppender.java | 2 +- .../enrollment/EnrollmentImportHandler.java | 4 +-- .../core/enrollment/EnrollmentStore.java | 2 +- .../core/enrollment/EnrollmentStoreImpl.java | 6 ++-- .../enrollment/note/NoteChildrenAppender.java | 2 +- .../enrollment/note/NoteEntityDIModule.java | 2 +- .../core/enrollment/note/NoteStore.java | 4 +-- .../note/NoteUniquenessManager.java | 2 +- .../hisp/dhis/android/core/event/Event.java | 3 +- .../core/event/EventChildrenAppender.java | 2 +- .../core/event/EventCollectionRepository.java | 2 +- .../core/event/EventEndpointCallFactory.java | 3 +- .../core/event/EventImportHandler.java | 2 +- .../dhis/android/core/event/EventModel.java | 5 +-- .../dhis/android/core/event/EventModule.java | 3 +- .../event/EventPersistenceCallFactory.java | 7 ++-- .../dhis/android/core/event/EventQuery.java | 6 ++-- .../dhis/android/core/event/EventStore.java | 2 +- .../android/core/event/EventStoreImpl.java | 6 ++-- .../core/imports/BaseImportSummaries.java | 4 +-- .../core/imports/BaseImportSummary.java | 6 ++-- .../core/imports/DataValueImportSummary.java | 6 ++-- .../imports/EnrollmentImportSummaries.java | 4 +-- .../core/imports/EnrollmentImportSummary.java | 4 +-- .../core/imports/EventImportSummaries.java | 4 +-- .../core/imports/EventWebResponse.java | 4 +-- .../android/core/imports/ImportConflict.java | 4 +-- .../android/core/imports/ImportCount.java | 4 +-- .../core/imports/TEIImportSummaries.java | 4 +-- .../core/imports/TEIImportSummary.java | 4 +-- .../android/core/imports/TEIWebResponse.java | 4 +-- ...kerImportConflictCollectionRepository.java | 2 +- .../TrackerImportConflictEntityDIModule.java | 2 +- .../imports/TrackerImportConflictStore.java | 4 +-- .../android/core/imports/WebResponse.java | 4 +-- .../DataSetIndicatorChildrenAppender.java | 2 +- .../DataSetIndicatorEntityDIModule.java | 2 +- .../indicator/DataSetIndicatorLinkStore.java | 4 +-- .../IndicatorCollectionRepository.java | 2 +- .../indicator/IndicatorEntityDIModule.java | 2 +- .../core/indicator/IndicatorStore.java | 4 +-- .../IndicatorTypeCollectionRepository.java | 2 +- .../IndicatorTypeEntityDIModule.java | 2 +- .../core/indicator/IndicatorTypeStore.java | 4 +-- .../legendset/LegendChildrenAppender.java | 2 +- .../core/legendset/LegendEntityDIModule.java | 2 +- .../LegendSetCollectionRepository.java | 2 +- .../legendset/LegendSetEntityDIModule.java | 2 +- .../core/legendset/LegendSetHandler.java | 2 +- .../core/legendset/LegendSetStore.java | 4 +-- .../android/core/legendset/LegendStore.java | 4 +-- .../ProgramIndicatorLegendSetLinkStore.java | 4 +-- .../D2ErrorCollectionRepository.java | 2 +- .../maintenance/D2ErrorEntityDIModule.java | 2 +- .../core/maintenance/D2ErrorStore.java | 4 +-- .../maintenance/ForeignKeyCleanerImpl.java | 2 +- ...reignKeyViolationCollectionRepository.java | 2 +- .../ForeignKeyViolationEntityDIModule.java | 2 +- .../maintenance/ForeignKeyViolationStore.java | 4 +-- .../MaintenancePackageDIModule.java | 2 +- .../maintenance/PerformanceHintsService.java | 2 +- .../option/OptionCollectionRepository.java | 2 +- .../core/option/OptionEntityDIModule.java | 2 +- .../OptionGroupCollectionRepository.java | 2 +- .../option/OptionGroupEntityDIModule.java | 2 +- .../core/option/OptionGroupHandler.java | 2 +- .../OptionGroupOptionChildrenAppender.java | 2 +- .../OptionGroupOptionEntityDIModule.java | 2 +- .../core/option/OptionGroupOptionLink.java | 3 +- .../option/OptionGroupOptionLinkStore.java | 4 +-- .../OptionGroupOptionLinkTableInfo.java | 2 +- .../android/core/option/OptionGroupStore.java | 7 ++-- .../android/core/option/OptionHandler.java | 2 +- .../dhis/android/core/option/OptionModel.java | 3 +- .../dhis/android/core/option/OptionSet.java | 3 +- .../option/OptionSetCollectionRepository.java | 2 +- .../core/option/OptionSetEntityDIModule.java | 2 +- .../android/core/option/OptionSetHandler.java | 2 +- .../android/core/option/OptionSetModel.java | 3 +- .../OptionSetOptionChildrenAppender.java | 2 +- .../android/core/option/OptionSetStore.java | 7 ++-- .../dhis/android/core/option/OptionStore.java | 4 +-- .../OrganisationUnitCollectionRepository.java | 2 +- ...ganisationUnitDataSetChildrenAppender.java | 2 +- .../OrganisationUnitEntityDIModule.java | 2 +- ...nisationUnitGroupCollectionRepository.java | 2 +- .../OrganisationUnitGroupEntityDIModule.java | 2 +- .../OrganisationUnitGroupStore.java | 4 +-- .../OrganisationUnitHandlerImpl.java | 2 +- ...nisationUnitLevelCollectionRepository.java | 2 +- .../OrganisationUnitLevelEntityDIModule.java | 2 +- .../OrganisationUnitLevelStore.java | 4 +-- ...ionUnitOrganisationUnitGroupLinkStore.java | 4 +-- ...ationUnitGroupProgramChildrenAppender.java | 2 +- ...ganisationUnitProgramChildrenAppender.java | 2 +- ...nisationUnitProgramLinkEntityDIModule.java | 2 +- .../OrganisationUnitProgramLinkStore.java | 4 +-- .../OrganisationUnitStore.java | 4 +-- .../SearchOrganisationUnitHandlerImpl.java | 2 +- .../hisp/dhis/android/core/period/Period.java | 3 +- .../dhis/android/core/period/PeriodModel.java | 3 +- .../dhis/android/core/period/PeriodStore.java | 2 +- .../android/core/period/PeriodStoreImpl.java | 4 +-- .../dhis/android/core/program/Program.java | 3 +- .../ProgramCategoryComboChildrenAppender.java | 2 +- .../core/program/ProgramIndicator.java | 3 +- .../ProgramIndicatorChildrenAppender.java | 2 +- .../ProgramIndicatorCollectionRepository.java | 2 +- .../ProgramIndicatorEntityDIModule.java | 2 +- .../core/program/ProgramIndicatorHandler.java | 2 +- ...ramIndicatorLegendSetChildrenAppender.java | 2 +- ...ogramIndicatorLegendSetEntityDIModule.java | 2 +- .../core/program/ProgramIndicatorModel.java | 5 +-- .../core/program/ProgramIndicatorStore.java | 7 ++-- .../android/core/program/ProgramModel.java | 3 +- .../android/core/program/ProgramRule.java | 3 +- .../core/program/ProgramRuleAction.java | 3 +- .../ProgramRuleActionChildrenAppender.java | 2 +- ...ProgramRuleActionCollectionRepository.java | 2 +- .../ProgramRuleActionEntityDIModule.java | 2 +- .../core/program/ProgramRuleActionModel.java | 5 +-- .../core/program/ProgramRuleActionStore.java | 7 ++-- .../program/ProgramRuleChildrenAppender.java | 2 +- .../ProgramRuleCollectionRepository.java | 2 +- .../program/ProgramRuleEntityDIModule.java | 2 +- .../core/program/ProgramRuleHandler.java | 2 +- .../core/program/ProgramRuleModel.java | 3 +- .../core/program/ProgramRuleStore.java | 7 ++-- .../core/program/ProgramRuleVariable.java | 3 +- .../ProgramRuleVariableChildrenAppender.java | 2 +- ...ogramRuleVariableCollectionRepository.java | 2 +- .../ProgramRuleVariableEntityDIModule.java | 2 +- .../program/ProgramRuleVariableModel.java | 3 +- .../program/ProgramRuleVariableStore.java | 4 +-- .../android/core/program/ProgramSection.java | 3 +- ...ogramSectionAttributeChildrenAppender.java | 2 +- ...ProgramSectionAttributeEntityDIModule.java | 2 +- .../ProgramSectionAttributeLinkStore.java | 4 +-- .../ProgramSectionChildrenAppender.java | 2 +- .../ProgramSectionCollectionRepository.java | 2 +- .../program/ProgramSectionEntityDIModule.java | 2 +- .../core/program/ProgramSectionHandler.java | 2 +- .../core/program/ProgramSectionModel.java | 3 +- .../core/program/ProgramSectionStore.java | 7 ++-- .../android/core/program/ProgramStage.java | 3 +- .../program/ProgramStageChildrenAppender.java | 2 +- .../ProgramStageCollectionRepository.java | 2 +- .../core/program/ProgramStageDataElement.java | 3 +- ...ogramStageDataElementChildrenAppender.java | 2 +- ...ProgramStageDataElementEntityDIModule.java | 2 +- .../ProgramStageDataElementHandler.java | 2 +- .../program/ProgramStageDataElementStore.java | 4 +-- .../program/ProgramStageEntityDIModule.java | 2 +- .../core/program/ProgramStageHandler.java | 2 +- .../core/program/ProgramStageModel.java | 3 +- .../core/program/ProgramStageSection.java | 3 +- .../ProgramStageSectionChildrenAppender.java | 2 +- ...ageSectionDataElementChildrenAppender.java | 2 +- ...StageSectionDataElementEntityDIModule.java | 2 +- ...ogramStageSectionDataElementLinkStore.java | 4 +-- .../ProgramStageSectionEntityDIModule.java | 2 +- .../program/ProgramStageSectionHandler.java | 2 +- ...ctionProgramIndicatorChildrenAppender.java | 2 +- ...SectionProgramIndicatorEntityDIModule.java | 2 +- ...StageSectionProgramIndicatorLinkStore.java | 4 +-- .../program/ProgramStageSectionStore.java | 4 +-- ...gramStageSectionsCollectionRepository.java | 2 +- .../core/program/ProgramStageStore.java | 7 ++-- .../android/core/program/ProgramStore.java | 9 ++--- .../core/program/ProgramStoreInterface.java | 2 +- ...rackedEntityAttributeChildrenAppender.java | 2 +- ...mTrackedEntityAttributeEntityDIModule.java | 2 +- .../ProgramTrackedEntityAttributeHandler.java | 2 +- .../ProgramTrackedEntityAttributeStore.java | 4 +-- ...gramTrackedEntityTypeChildrenAppender.java | 2 +- ...elationshipConstraintChildrenAppender.java | 2 +- .../RelationshipConstraintEntityDIModule.java | 2 +- .../RelationshipConstraintStore.java | 4 +-- .../relationship/RelationshipItemStore.java | 2 +- .../RelationshipItemStoreImpl.java | 4 +-- .../core/relationship/RelationshipStore.java | 2 +- .../relationship/RelationshipStoreImpl.java | 6 ++-- .../RelationshipTypeCollectionRepository.java | 2 +- .../RelationshipTypeEntityDIModule.java | 2 +- .../relationship/RelationshipTypeHandler.java | 2 +- .../relationship/RelationshipTypeStore.java | 4 +-- .../android/core/resource/ResourceStore.java | 2 +- .../core/resource/ResourceStoreImpl.java | 4 +-- .../SystemSettingCollectionRepository.java | 2 +- .../settings/SystemSettingEntityDIModule.java | 2 +- .../core/settings/SystemSettingStore.java | 4 +-- .../core/systeminfo/DHISVersionManager.java | 2 +- .../systeminfo/SystemInfoEntityDIModule.java | 2 +- .../SystemInfoObjectRepository.java | 2 +- .../core/systeminfo/SystemInfoStore.java | 4 +-- ...edEntityAttributeCollectionRepository.java | 2 +- .../TrackedEntityAttributeEntityDIModule.java | 2 +- .../TrackedEntityAttributeHandler.java | 2 +- ...edEntityAttributeReservedValueManager.java | 2 +- ...ckedEntityAttributeReservedValueStore.java | 4 +-- ...yAttributeReservedValueStoreInterface.java | 2 +- .../TrackedEntityAttributeStore.java | 4 +-- ...dEntityAttributeValueChildrenAppender.java | 2 +- .../TrackedEntityAttributeValueStore.java | 2 +- .../TrackedEntityAttributeValueStoreImpl.java | 4 +-- ...rackedEntityDataValueChildrenAppender.java | 2 +- .../TrackedEntityDataValueStore.java | 2 +- .../TrackedEntityDataValueStoreImpl.java | 4 +-- .../TrackedEntityInstanceImportHandler.java | 2 +- ...dEntityInstancePersistenceCallFactory.java | 2 +- .../TrackedEntityInstancePostCall.java | 2 +- ...nceRelationshipPersistenceCallFactory.java | 2 +- .../TrackedEntityInstanceStore.java | 2 +- .../TrackedEntityInstanceStoreImpl.java | 6 ++-- .../TrackedEntityInstanceUidHelperImpl.java | 2 +- ...kedEntityInstanceWithLimitCallFactory.java | 2 +- ...edEntityTypeAttributeChildrenAppender.java | 2 +- ...tityTypeAttributeCollectionRepository.java | 2 +- ...ckedEntityTypeAttributeEntityDIModule.java | 2 +- .../TrackedEntityTypeAttributeStore.java | 4 +-- ...TrackedEntityTypeCollectionRepository.java | 2 +- .../TrackedEntityTypeEntityDIModule.java | 2 +- .../TrackedEntityTypeHandler.java | 2 +- .../trackedentity/TrackedEntityTypeStore.java | 4 +-- .../android/core/user/AuthenticatedUser.java | 3 +- .../user/AuthenticatedUserEntityDIModule.java | 2 +- .../core/user/AuthenticatedUserModel.java | 5 +-- .../AuthenticatedUserObjectRepository.java | 2 +- .../core/user/AuthenticatedUserStore.java | 4 +-- .../dhis/android/core/user/Authority.java | 3 +- .../core/user/AuthorityCallFetcher.java | 4 +-- .../user/AuthorityCollectionRepository.java | 2 +- .../core/user/AuthorityEntityDIModule.java | 2 +- .../android/core/user/AuthorityStore.java | 4 +-- .../core/user/IsUserLoggedInCallable.java | 6 ++-- .../android/core/user/LogOutUserCallable.java | 6 ++-- .../org/hisp/dhis/android/core/user/User.java | 5 +-- .../user/UserAuthenticateCallFactory.java | 4 +-- .../android/core/user/UserCredentials.java | 3 +- .../core/user/UserCredentialsModel.java | 3 +- .../core/user/UserCredentialsStore.java | 2 +- .../core/user/UserCredentialsStoreImpl.java | 9 ++--- .../android/core/user/UserEntityDIModule.java | 2 +- .../dhis/android/core/user/UserHandler.java | 2 +- .../android/core/user/UserInternalModule.java | 3 +- .../dhis/android/core/user/UserModel.java | 5 +-- .../core/user/UserObjectRepository.java | 2 +- .../UserOrganisationUnitChildrenAppender.java | 2 +- .../core/user/UserOrganisationUnitLink.java | 3 +- .../user/UserOrganisationUnitLinkHelper.java | 4 +-- .../user/UserOrganisationUnitLinkModel.java | 5 +-- .../user/UserOrganisationUnitLinkStore.java | 2 +- .../UserOrganisationUnitLinkStoreImpl.java | 4 +-- .../UserOrganisationUnitLinkTableInfo.java | 2 +- .../core/user/UserRoleChildrenAppender.java | 2 +- .../user/UserRoleCollectionRepository.java | 2 +- .../core/user/UserRoleEntityDIModule.java | 2 +- .../dhis/android/core/user/UserRoleStore.java | 7 ++-- .../dhis/android/core/user/UserStore.java | 7 ++-- .../android/core/utils/CodeGeneratorImpl.java | 4 +-- .../dhis/android/core/utils/StoreUtils.java | 3 +- .../hisp/dhis/android/core/utils/Utils.java | 6 ++-- .../services/ProgramIndicatorEngine.java | 2 +- .../api/internal/APICallExecutorShould.java | 2 +- .../internal}/SQLStatementBuilderShould.java | 4 ++- .../collection/RepositoryPagingShould.java | 2 +- .../category/CategoryComboHandlerShould.java | 2 +- .../core/category/CategoryHandlerShould.java | 2 +- .../core/common/MetadataCallShould.java | 1 + .../core/common/ObjectStyleHandlerShould.java | 1 + .../data/api/BasicAuthenticatorShould.java | 2 +- .../dataelement/DataElementHandlerShould.java | 2 +- .../core/dataset/DataSetHandlerShould.java | 2 +- .../core/dataset/SectionHandlerShould.java | 2 +- .../EnrollmentImportHandlerShould.java | 4 +-- .../core/event/EventImportHandlerShould.java | 2 +- .../legendset/LegendSetHandlerShould.java | 2 +- .../PerformanceHintsServiceShould.java | 2 +- .../core/option/OptionSetHandlerShould.java | 2 +- .../OrganisationUnitHandlerShould.java | 4 +-- .../SearchOrganisationUnitHandlerShould.java | 2 +- .../ProgramIndicatorHandlerShould.java | 2 +- .../program/ProgramRuleHandlerShould.java | 2 +- .../program/ProgramSectionHandlerShould.java | 2 +- .../ProgramStageDataElementHandlerShould.java | 2 +- .../program/ProgramStageHandlerShould.java | 2 +- .../ProgramStageSectionHandlerShould.java | 2 +- ...amTrackedEntityAttributeHandlerShould.java | 2 +- .../TrackedEntityAttributeHandlerShould.java | 2 +- ...ckedEntityInstanceImportHandlerShould.java | 2 +- .../TrackedEntityInstanceUidHelperShould.java | 2 +- .../user/IsUserLoggedInCallableShould.java | 2 +- .../core/user/LogOutUserCallableShould.java | 2 +- .../user/UserAuthenticateCallUnitShould.java | 4 +-- .../android/core/user/UserHandlerShould.java | 2 +- .../ProgramIndicatorEngineShould.java | 2 +- 474 files changed, 788 insertions(+), 662 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/querybuilders/internal}/SQLStatementBuilder.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/statementwrapper/internal}/SQLStatementWrapper.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/IdentifiableObjectStore.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/IdentifiableObjectStoreImpl.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/IdentifiableObjectWithStateStore.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/IdentifiableObjectWithStateStoreImpl.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/LinkModelStore.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/LinkModelStoreImpl.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/ObjectStore.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/ObjectStoreImpl.java (95%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/ObjectWithoutUidStore.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/ObjectWithoutUidStoreImpl.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/stores/internal}/StoreFactory.java (88%) rename core/src/test/java/org/hisp/dhis/android/core/{common => arch/db/querybuilders/internal}/SQLStatementBuilderShould.java (98%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java index 8bb732f6d6..03165ae749 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.category.CategoryOption; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher; import org.hisp.dhis.android.core.utils.runner.D2JunitRunner; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStoreShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStoreShould.java index 1bb4a6faf2..3897f35dc1 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStoreShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStoreShould.java @@ -30,8 +30,8 @@ import androidx.test.runner.AndroidJUnit4; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.junit.Before; import org.junit.Test; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStoreShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStoreShould.java index 349671a968..f19ae30e59 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStoreShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStoreShould.java @@ -30,8 +30,8 @@ import androidx.test.runner.AndroidJUnit4; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.junit.Before; import org.junit.Test; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallRealIntegrationShould.java index d636e42672..0e33a34ce7 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallRealIntegrationShould.java @@ -32,8 +32,8 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.common.D2Factory; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.RealServerMother; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java index 830664f536..245c0ac045 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java @@ -32,6 +32,7 @@ import android.database.sqlite.SQLiteConstraintException; import androidx.test.runner.AndroidJUnit4; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.option.OptionSet; import org.hisp.dhis.android.core.option.OptionSetStore; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java index 97a28bf33b..de1d035250 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java @@ -32,6 +32,7 @@ import android.database.sqlite.SQLiteConstraintException; import androidx.test.runner.AndroidJUnit4; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.option.OptionSet; import org.hisp.dhis.android.core.option.OptionSetStore; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java index a59132126b..56633d66dd 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.DataModel; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithDeleteInterface; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java index a4c69b0403..fd9ac80034 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java index b52d859568..a8d866141b 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkModelStoreAbstractIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.data.database; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.Model; import org.junit.Before; import org.junit.Test; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java index aa9eaff7b5..9aa39aa23d 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.junit.Before; import org.junit.Test; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java index 981f5e291c..360fee90ea 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.junit.Before; import org.junit.Test; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/note/NotePostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/note/NotePostCallRealIntegrationShould.java index 3625fcacd1..b6e847065f 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/note/NotePostCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/note/NotePostCallRealIntegrationShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.common.D2Factory; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.RealServerMother; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerShould.java index 46a2be6868..07d8d826a3 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerShould.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.D2Factory; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.Dhis2MockServer; import org.hisp.dhis.android.core.program.Program; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java index 938d9b5219..b34f9c7b0a 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.organisationunit.OrganisationUnitSamples; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetTableInfo; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java index 50f4ce2584..f7497d0b8c 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.RealServerMother; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreIntegrationShould.java index 502daaf133..e0229c6709 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitStore; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/LogoutCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/user/LogoutCallRealIntegrationShould.java index 581717ce28..b0317a9897 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/LogoutCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/LogoutCallRealIntegrationShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.common.D2Factory; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.hisp.dhis.android.core.data.server.RealServerMother; import org.hisp.dhis.android.core.event.Event; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.java b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.java index 6c8c72a2eb..1b6dec1bfc 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.utils.integration.mock; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.imports.TrackerImportConflictSamples; import org.hisp.dhis.android.core.data.maintenance.D2ErrorSamples; import org.hisp.dhis.android.core.imports.ImportStatus; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineIntegrationShould.java index 600ab32dc0..847d555d40 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineIntegrationShould.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.common.AggregationType; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.FormType; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ValueType; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java index e6c49e3ed6..9f9608243e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java +++ b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java @@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.category.CategoryOption; import org.hisp.dhis.android.core.category.CategoryPackageDIModule; import org.hisp.dhis.android.core.common.CommonPackageDIModule; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.constant.ConstantPackageDIModule; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.DatabaseDIModule; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java index 3190c2b56b..442c9a42d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorImpl.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.api.internal; import org.hisp.dhis.android.core.ObjectMapperFactory; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java index deaf963d3f..e98370afd3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/RxAPICallExecutorImpl.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.call.D2CallWithProgress; import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2CallWithProgressImpl; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilder.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilder.java index dfedb5d1a8..48fe136acb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementBuilder.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilder.java @@ -26,10 +26,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.querybuilders.internal; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import org.hisp.dhis.android.core.common.BaseModel; +import org.hisp.dhis.android.core.common.BaseNameableObjectModel; +import org.hisp.dhis.android.core.common.SQLOrderType; import org.hisp.dhis.android.core.utils.Utils; import static org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo.SORT_ORDER; @@ -38,7 +42,7 @@ public class SQLStatementBuilder { // TODO save TableInfo instead of separate files when architecture 1.0 is ready - final String tableName; + public final String tableName; public final String[] columns; private final String[] whereColumns; private final boolean hasSortOrder; @@ -60,7 +64,7 @@ public class SQLStatementBuilder { } @SuppressWarnings("PMD.UseVarargs") - SQLStatementBuilder(String tableName, String[] columns, String[] updateWhereColumns) { + public SQLStatementBuilder(String tableName, String[] columns, String[] updateWhereColumns) { this(tableName, columns, updateWhereColumns, false); } @@ -103,19 +107,19 @@ public String insert() { "VALUES (" + commaSeparatedInterrogationMarks() + ");"; } - String deleteById() { + public String deleteById() { return "DELETE" + FROM + tableName + WHERE + UID + "=?;"; } - String selectUids() { + public String selectUids() { return SELECT + UID + FROM + tableName; } - String selectUidsWhere(String whereClause) { + public String selectUidsWhere(String whereClause) { return SELECT + UID + FROM + tableName + WHERE + whereClause + ";"; } - String selectColumnWhere(String column, String whereClause) { + public String selectColumnWhere(String column, String whereClause) { return SELECT + column + FROM + tableName + WHERE + whereClause + ";"; } @@ -143,7 +147,7 @@ private String orderBySortOrderClause() { return hasSortOrder ? ORDER_BY + SORT_ORDER : ""; } - String selectByUid() { + public String selectByUid() { return selectWhere(andSeparatedColumnEqualInterrogationMark(UID)); } @@ -151,27 +155,27 @@ public String selectWhere(String whereClause) { return SELECT + "*" + FROM + tableName + WHERE + whereClause + ";"; } - String selectWhere(String whereClause, int limit) { + public String selectWhere(String whereClause, int limit) { return selectWhere(whereClause + LIMIT + limit); } - String selectWhere(String whereClause, String orderByClause) { + public String selectWhere(String whereClause, String orderByClause) { return selectWhere(whereClause + ORDER_BY + orderByClause); } - String selectWhere(String whereClause, String orderByClause, int limit) { + public String selectWhere(String whereClause, String orderByClause, int limit) { return selectWhere(whereClause + ORDER_BY + orderByClause + LIMIT + limit); } - String selectAll() { + public String selectAll() { return SELECT + "*" + FROM + tableName; } - String count() { + public String count() { return SELECT + "COUNT(*)" + FROM + tableName + ";"; } - String countWhere(String whereClause) { + public String countWhere(String whereClause) { return SELECT + "COUNT(*)" + FROM + tableName + WHERE + whereClause + ";"; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementWrapper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/statementwrapper/internal/SQLStatementWrapper.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementWrapper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/statementwrapper/internal/SQLStatementWrapper.java index db69d73811..a888c31457 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/SQLStatementWrapper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/statementwrapper/internal/SQLStatementWrapper.java @@ -26,17 +26,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.statementwrapper.internal; import android.database.sqlite.SQLiteStatement; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public class SQLStatementWrapper { public final SQLiteStatement insert; public final SQLiteStatement update; - final SQLiteStatement deleteById; - final String selectUids; + public final SQLiteStatement deleteById; + public final String selectUids; public SQLStatementWrapper(SQLStatementBuilder builder, DatabaseAdapter databaseAdapter) { this.insert = databaseAdapter.compileStatement(builder.insert()); diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java index 6106fe304a..bcdd887185 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java @@ -26,12 +26,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import androidx.annotation.NonNull; +import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import java.util.List; +import androidx.annotation.NonNull; + public interface IdentifiableObjectStore extends ObjectStore { void delete(@NonNull String uid) throws RuntimeException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java index f374c28754..425c5b0a6a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java @@ -26,16 +26,23 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.Cursor; -import androidx.annotation.NonNull; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.common.Model; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; import static org.hisp.dhis.android.core.utils.Utils.isNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStore.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStore.java index c1f8db68e3..4b77d23034 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStore.java @@ -26,7 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; + +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; +import org.hisp.dhis.android.core.common.StoreWithState; public interface IdentifiableObjectWithStateStore extends IdentifiableObjectStore, StoreWithState { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java index 024c1fa67e..17e38fe855 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/IdentifiableObjectWithStateStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java @@ -26,13 +26,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.common.Model; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; +import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java index ce22d8a36c..5e29d58a00 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelChildStoreImpl.java @@ -28,14 +28,14 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutor; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; -public class LinkModelChildStoreImpl

+class LinkModelChildStoreImpl

implements LinkModelChildStore { private final LinkTableChildProjection linkTableChildProjection; @@ -45,7 +45,7 @@ public class LinkModelChildStoreImpl

cursorExecutor; - public LinkModelChildStoreImpl(LinkTableChildProjection linkTableChildProjection, + LinkModelChildStoreImpl(LinkTableChildProjection linkTableChildProjection, DatabaseAdapter databaseAdapter, SQLStatementBuilder statementBuilder, CursorExecutor cursorExecutor) { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStore.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStore.java index 5806060061..d55a1edfe5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStore.java @@ -26,7 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; + +import org.hisp.dhis.android.core.common.Model; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java index 4a42f7358a..9acdc2441f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java @@ -26,14 +26,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + public class LinkModelStoreImpl extends ObjectStoreImpl implements LinkModelStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/common/ObjectStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java index 0136f0d974..20df7bc40e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java @@ -26,7 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; + +import org.hisp.dhis.android.core.common.DeletableStore; +import org.hisp.dhis.android.core.common.SQLOrderType; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java similarity index 95% rename from core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java index a689fe1fe3..0209822c10 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java @@ -26,12 +26,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.Cursor; import android.database.sqlite.SQLiteStatement; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.common.BaseModel; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.Model; +import org.hisp.dhis.android.core.common.SQLOrderType; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java index 39c839082b..dd47203429 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.java @@ -28,23 +28,23 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; -public class ObjectWithUidChildStoreImpl

implements ObjectWithUidChildStore

{ +class ObjectWithUidChildStoreImpl

implements ObjectWithUidChildStore

{ private final LinkTableChildProjection linkTableChildProjection; private final DatabaseAdapter databaseAdapter; private final SQLStatementBuilder statementBuilder; - public ObjectWithUidChildStoreImpl(LinkTableChildProjection linkTableChildProjection, + ObjectWithUidChildStoreImpl(LinkTableChildProjection linkTableChildProjection, DatabaseAdapter databaseAdapter, SQLStatementBuilder statementBuilder) { this.linkTableChildProjection = linkTableChildProjection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStore.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java index 28a8bfda63..1768deba0f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java @@ -26,7 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; + +import org.hisp.dhis.android.core.common.HandleAction; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java index 4badab39d0..9453cb0465 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithoutUidStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java @@ -26,12 +26,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; import android.database.sqlite.SQLiteStatement; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java index 007f04e4e7..8142ac80f9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.java @@ -28,15 +28,15 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutor; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; -public class SingleParentChildStoreImpl

implements SingleParentChildStore { +class SingleParentChildStoreImpl

implements SingleParentChildStore { private final SingleParentChildProjection childProjection; @@ -45,7 +45,7 @@ public class SingleParentChildStoreImpl

imp private final CursorExecutor cursorExecutor; - public SingleParentChildStoreImpl(SingleParentChildProjection childProjection, + SingleParentChildStoreImpl(SingleParentChildProjection childProjection, DatabaseAdapter databaseAdapter, SQLStatementBuilder statementBuilder, CursorExecutor cursorExecutor) { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java similarity index 88% rename from core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java index 163861fbd6..2af82b35aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/StoreFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java @@ -26,20 +26,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStoreImpl; -import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore; -import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStoreImpl; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; -import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStoreImpl; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.common.Model; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public final class StoreFactory { @@ -56,9 +55,9 @@ public static IdentifiableObjectStore } public static ObjectStore objectStore(DatabaseAdapter databaseAdapter, - TableInfo tableInfo, - StatementBinder binder, - CursorModelFactory modelFactory) { + TableInfo tableInfo, + StatementBinder binder, + CursorModelFactory modelFactory) { SQLStatementBuilder statementBuilder = new SQLStatementBuilder(tableInfo.name(), tableInfo.columns().all(), new String[]{}); return new ObjectStoreImpl<>(databaseAdapter, databaseAdapter.compileStatement(statementBuilder.insert()), diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java index 699649e3c0..d6e97a5fda 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.di.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; public interface IdentifiableEntityDIModule extends IdentifiableStoreProvider { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java index cb304ca0c0..1b6a3bb323 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.di.internal; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java index 5b8f5452db..c6d9c29d2e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.arch.di.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; public interface ObjectWithoutUidEntityDIModule extends ObjectWithoutUidStoreProvider { SyncHandler handler(ObjectWithoutUidStore store); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java index 697c22c165..b3ec136d02 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.di.internal; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public interface ObjectWithoutUidStoreProvider { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java index b2f07959c9..8d04fc9d93 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java @@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.DataModel; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithDeleteInterface; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java index 6a28f17c01..641603b370 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.arch.handlers.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithDeleteInterface; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java index 7f8e99c2ad..10fcf54734 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.arch.handlers.internal; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java index f3b6713537..8ce59ad158 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.arch.handlers.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; public class ObjectWithoutUidSyncHandlerImpl extends SyncHandlerBaseImpl { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java index d892470fa2..a4ceef1ba5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java @@ -29,6 +29,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; @@ -39,7 +40,6 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectStore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java index 4250a99c8f..2c21aa3942 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java @@ -27,6 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepository; @@ -36,7 +37,6 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel.Columns; import org.hisp.dhis.android.core.common.IdentifiableObject; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java index 1a4cad8d57..7a225b76d4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java @@ -27,6 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepository; @@ -34,7 +35,6 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseNameableObjectModel.Columns; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.NameableObject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java index f7af0303cc..ddceee6971 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java @@ -27,6 +27,7 @@ */ package org.hisp.dhis.android.core.arch.repositories.collection.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository; @@ -34,7 +35,6 @@ import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java index 0443325f8c..82c01262ea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java @@ -29,13 +29,13 @@ import android.database.sqlite.SQLiteConstraintException; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java index 0dd0bd81f0..954e262042 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java @@ -27,11 +27,11 @@ */ package org.hisp.dhis.android.core.arch.repositories.object; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java index c83559fb12..18f24856ca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java index 067afd4793..90c8eb339e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.arch.repositories.object.internal; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java index f860ace4c0..7d1faa8e6e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java @@ -27,11 +27,11 @@ */ package org.hisp.dhis.android.core.arch.repositories.object.internal; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.DataModel; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java index db79664052..71de04cbf2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java @@ -29,10 +29,10 @@ import android.database.sqlite.SQLiteConstraintException; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.Unit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java index e9c82655c4..3b69f5dee1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java @@ -29,11 +29,11 @@ import android.database.sqlite.SQLiteConstraintException; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java index 26d494e8fc..2088938950 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java @@ -29,12 +29,12 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder; import org.hisp.dhis.android.core.common.Model; -import org.hisp.dhis.android.core.common.ObjectStore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java index 521428c2fe..c978482d31 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java @@ -28,14 +28,14 @@ package org.hisp.dhis.android.core.calls; -import androidx.annotation.VisibleForTesting; - import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; import java.util.List; import java.util.concurrent.Callable; +import androidx.annotation.VisibleForTesting; + public final class EndpointCall

implements Callable> { private final CallFetcher

fetcher; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java b/core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java index fbb159082d..755516ba65 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java @@ -27,8 +27,6 @@ */ package org.hisp.dhis.android.core.calls; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.category.CategoryModuleDownloader; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.Unit; @@ -50,6 +48,7 @@ import javax.inject.Inject; +import androidx.annotation.NonNull; import dagger.Reusable; @Reusable diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java index b905691ec4..40e62f3fbe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class CategoryCategoryComboChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java index 21c0c2c33f..ec7e5f99b9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java index b62b617540..54ad436d28 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboLinkStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java index 8babacf213..daa8cd18dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class CategoryCategoryOptionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java index 0c39d37062..3d04ced978 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java index 340619f009..479def6f14 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java index 46c885542f..495796d797 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java index 565a7e4fe8..ab239de4d2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java index 4ad11183ee..26dac9bbc6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java index 81ab9765a1..1c3e83842c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java index c519a5ae43..a03d4d43b9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboStore.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java index 9a3eee9f1b..d9789d671b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java index 1ccc15799e..a2f3e7775b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java index 591cf12bb9..a625e721a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java index 6f4efe3147..a3bb4af5c5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class CategoryOptionComboCategoryOptionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java index f679409b7c..aeb0d9b7c2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java index 80aac152a6..dcca9811c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionLinkStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStore.java index 5b27cf6178..88f5836582 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStore.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java index b2653b9c80..db46113803 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java @@ -34,9 +34,9 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java index 155cc07db4..7f35b19a9a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java index 9329dd68ff..361ceebc1f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java index 99029cbf6d..436cf22831 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/Access.java b/core/src/main/java/org/hisp/dhis/android/core/common/Access.java index 3a6a3a7c7d..74ee68942d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/Access.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/Access.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; @@ -37,6 +35,8 @@ import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.NestedField; +import androidx.annotation.Nullable; + @AutoValue public abstract class Access { private static final String READ = "read"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java b/core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java index 2e64d5ab99..4a25eabacb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.data.database.EnumColumnAdapter; +import androidx.annotation.NonNull; + public class AggregationTypeColumnAdapter extends EnumColumnAdapter { @Override diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/BaseDataModel.java b/core/src/main/java/org/hisp/dhis/android/core/common/BaseDataModel.java index 779ca331e1..3b86fe7881 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/BaseDataModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/BaseDataModel.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; import org.hisp.dhis.android.core.data.database.DbStateColumnAdapter; +import androidx.annotation.Nullable; + public abstract class BaseDataModel extends BaseModel implements DataModel { public static class Columns extends BaseModel.Columns { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableDataModel.java b/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableDataModel.java index 3f1ec31067..05b3433640 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableDataModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableDataModel.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -37,6 +35,8 @@ import java.util.Date; +import androidx.annotation.Nullable; + public abstract class BaseIdentifiableDataModel extends BaseDataModel { public static class Columns extends BaseDataModel.Columns { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableObjectModel.java b/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableObjectModel.java index d8709114d8..34a1bff064 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableObjectModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/BaseIdentifiableObjectModel.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -38,6 +36,8 @@ import java.util.Date; +import androidx.annotation.Nullable; + public abstract class BaseIdentifiableObjectModel extends BaseModel implements IdentifiableObject { public abstract static class Columns extends BaseModel.Columns { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObject.java b/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObject.java index 44e3ca0718..55dc453a8c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObject.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObject.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import androidx.annotation.Nullable; + public abstract class BaseNameableObject extends BaseIdentifiableObject implements NameableObject { public static final String SHORT_NAME = "shortName"; public static final String DISPLAY_SHORT_NAME = "displayShortName"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObjectModel.java b/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObjectModel.java index 34ee49842b..bbbefc3914 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObjectModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/BaseNameableObjectModel.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.gabrielittner.auto.value.cursor.ColumnName; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + public abstract class BaseNameableObjectModel extends BaseIdentifiableObjectModel implements NameableObject { public abstract static class Columns extends BaseIdentifiableObjectModel.Columns { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/Coordinates.java b/core/src/main/java/org/hisp/dhis/android/core/common/Coordinates.java index 0e1267e593..a0911f6933 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/Coordinates.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/Coordinates.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; +import androidx.annotation.Nullable; + @AutoValue public abstract class Coordinates { private final static String LATITUDE = "latitude"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/D2CallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/common/D2CallExecutor.java index 1bbc78acd2..a92324fd53 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/D2CallExecutor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/D2CallExecutor.java @@ -30,6 +30,7 @@ import android.util.Log; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/DataAccess.java b/core/src/main/java/org/hisp/dhis/android/core/common/DataAccess.java index de0d2c25e6..0dea777762 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/DataAccess.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/DataAccess.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; @@ -37,6 +35,8 @@ import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; +import androidx.annotation.Nullable; + @AutoValue public abstract class DataAccess { private static final String READ = "read"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java index d4da2f7e7b..4813336016 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java @@ -27,6 +27,8 @@ */ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; + import java.util.Collection; public final class LinkModelHandlerImpl implements LinkModelHandler { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/Model.java b/core/src/main/java/org/hisp/dhis/android/core/common/Model.java index ecf85067f4..8c66758183 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/Model.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/Model.java @@ -29,11 +29,12 @@ package org.hisp.dhis.android.core.common; import android.content.ContentValues; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.gabrielittner.auto.value.cursor.ColumnName; +import androidx.annotation.Nullable; + public interface Model { @Nullable @ColumnName(BaseModel.Columns.ID) diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java index ce5135a378..376d3464d1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleEntityDIModule.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java index 4977778881..e0e00ce759 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java @@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.common; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; public class ObjectStyleHandlerImpl extends ObjectWithoutUidSyncHandlerImpl implements ObjectStyleHandler { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleModel.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleModel.java index d86ed9f3cb..2753c76e0d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleModel.java @@ -28,13 +28,14 @@ package org.hisp.dhis.android.core.common; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ObjectStyleModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java index 0b345ae043..d285f4f186 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStore.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; interface ObjectStyleStore extends ObjectWithoutUidStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java index aed0c3417c..18b11d0454 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java @@ -28,10 +28,12 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithStyle.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithStyle.java index 096d39612a..97aa5cfdf7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithStyle.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithStyle.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import org.hisp.dhis.android.core.data.database.IgnoreObjectStyleAdapter; +import androidx.annotation.Nullable; + public interface ObjectWithStyle> { @Nullable diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithUid.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithUid.java index 77fd33a752..70fbea4685 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithUid.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectWithUid.java @@ -28,14 +28,14 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.NonNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.data.api.Field; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.common.BaseIdentifiableObject.UID; @AutoValue diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java index d24834c92d..f9a919f7e9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java @@ -27,6 +27,8 @@ */ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; + import java.util.List; public class OrderedLinkSyncHandlerImpl implements OrderedLinkSyncHandler { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/SafeDateFormat.java b/core/src/main/java/org/hisp/dhis/android/core/common/SafeDateFormat.java index c5418bc021..13e15fca8a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/SafeDateFormat.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/SafeDateFormat.java @@ -28,14 +28,14 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.NonNull; - import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import androidx.annotation.NonNull; + public class SafeDateFormat { @NonNull diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRendering.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRendering.java index 1fc2f14d4d..44468e54f9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRendering.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRendering.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.common; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -37,6 +36,8 @@ import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.google.auto.value.AutoValue; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ValueTypeDeviceRendering.Builder.class) public abstract class ValueTypeDeviceRendering implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java index ce86e19b00..6ef2ba7039 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingModel.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingModel.java index 03855e1996..d3311ea0ed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingModel.java @@ -28,7 +28,6 @@ package org.hisp.dhis.android.core.common; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -36,6 +35,8 @@ import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ValueTypeDeviceRenderingModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java index 8238b2d62b..73b00c846c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStore.java @@ -30,6 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRendering.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRendering.java index 865907a0d1..189f4ea901 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRendering.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRendering.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.common; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; @@ -37,6 +35,8 @@ import org.hisp.dhis.android.core.data.api.Field; import org.hisp.dhis.android.core.data.api.Fields; +import androidx.annotation.Nullable; + @AutoValue public abstract class ValueTypeRendering { public static final String DESKTOP = "DESKTOP"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStore.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStore.java index 8fba21a292..c43c2228a8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStore.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.configuration; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; public interface ConfigurationStore extends ObjectStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java index 1a3c214d29..0b52e76e45 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/ConfigurationStoreImpl.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.configuration; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.ObjectStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java index 0aa9c27ce5..52439b7986 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java index d437d905f2..d3a14131af 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java index dbc6a92876..35b58c8535 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java index e61543f3f5..56f7b96dd7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticator.java b/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticator.java index 43b85b5310..b34fdc934e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticator.java +++ b/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticator.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.user.AuthenticatedUser; import java.io.IOException; diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorFactory.java b/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorFactory.java index 8f889a2101..267411f77c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorFactory.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.user.AuthenticatedUser; import org.hisp.dhis.android.core.user.AuthenticatedUserStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java index e44d64c546..47cf894c42 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java index 1d37045331..870b0a77ec 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalStore.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java index aed4c570c2..e8b2ef3625 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java index 9c9b5f20f5..2ed826a66c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java index ecca2930c6..69de3df90b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java index eb4146e4f5..3d388e5619 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java index d3ad03ed17..f235b3530d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataelement; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java index 8e4f9cd813..1f26243f69 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriod.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriod.java index 580914b12c..ca5600c191 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriod.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriod.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -46,6 +44,9 @@ import java.util.Date; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_DataInputPeriod.Builder.class) public abstract class DataInputPeriod extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java index b8ea100ef4..e660744595 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class DataInputPeriodChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java index 9523d831d9..1914d34c7b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java index 0e9ffb3b6a..02a7723795 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodModel.java index e3847f071b..3dc1632201 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -41,6 +40,8 @@ import java.util.Date; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class DataInputPeriodModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSet.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSet.java index 0620c98e36..be80dbc3f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSet.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSet.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -56,6 +55,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_DataSet.Builder.class) @SuppressWarnings({"PMD.GodClass", "PMD.ExcessivePublicCount"}) diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java index 96d1086c63..63178cfc16 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.period.PeriodType; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistration.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistration.java index b8eba6f263..ec17315655 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistration.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistration.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +43,9 @@ import java.util.Date; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = $$AutoValue_DataSetCompleteRegistration.Builder.class) public abstract class DataSetCompleteRegistration extends BaseDataModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java index 29c56ae0d9..edb93be288 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.dataset; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.maintenance.D2Error; @@ -43,6 +41,8 @@ import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; + abstract class DataSetCompleteRegistrationCallFetcher implements CallFetcher { private final static int MAX_ALLOWED_QUERY_LENGTH = 2500; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java index d6139d9da1..de3a5c089b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java @@ -30,9 +30,9 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStore.java index 29039a9fc3..2b1f2e71de 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java index 498b87b326..afdd5e3834 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationStoreImpl.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.dataset; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java index 6e48a4a0c4..7fc222cfed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java index 0ab5c6143e..7a1ead57dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLink.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLink.java index 87cce8aae9..f60cc2ee08 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLink.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLink.java @@ -29,13 +29,14 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class DataSetCompulsoryDataElementOperandLink implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkModel.java index b72e6d0ffe..7f1e48f534 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -37,6 +36,8 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class DataSetCompulsoryDataElementOperandLinkModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java index 0bda53a1de..cca8545f41 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java index 5f63075c53..edfa3968af 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkModel.java index 80e81a92d7..7a971ea19a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkModel.java @@ -28,7 +28,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -36,6 +35,8 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class DataSetDataElementLinkModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java index b60495faa2..74929d81f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java index 464c6f38b3..c25d817b3d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkTableInfo.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.dataset; -import androidx.annotation.VisibleForTesting; - import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.VisibleForTesting; + public final class DataSetDataElementLinkTableInfo { public static final TableInfo TABLE_INFO = new TableInfo() { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElement.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElement.java index 9b5d7a2a34..e887f1e2c7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElement.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElement.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -43,6 +41,9 @@ import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.data.database.ObjectWithUidColumnAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_DataSetElement.Builder.class) public abstract class DataSetElement implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java index 585c755849..33b49d1be4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class DataSetElementChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java index f8e3c1201b..447fb52e18 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java index e5d9f6c3ba..a2eae664ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java index f4bbac8b4c..fe77c18d38 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java index c99baafcb9..61201ab5d0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModel.java index af6b8b1995..9a50a95a1a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -40,6 +39,8 @@ import org.hisp.dhis.android.core.period.PeriodType; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class DataSetModel extends BaseNameableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLink.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLink.java index ba941a2f3c..d32d271781 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLink.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLink.java @@ -28,13 +28,14 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class DataSetOrganisationUnitLink implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkModel.java index 6573071e33..6156e38409 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkModel.java @@ -28,7 +28,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -36,6 +35,8 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class DataSetOrganisationUnitLinkModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java index bf17c53424..f61b9c1ab3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java index c1d2a9c5db..173df26cd6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetOrganisationUnitLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java index 086fe2021f..b3ca97e8bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java @@ -29,16 +29,17 @@ package org.hisp.dhis.android.core.dataset; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.AccessHelper; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; final class DataSetStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/Section.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/Section.java index 8485d864d8..88224e28ad 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/Section.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/Section.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -48,6 +47,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_Section.Builder.class) public abstract class Section extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java index 574506803c..9bf2860677 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class SectionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java index e8b90aa332..82c0110db9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java index 169a2f2d47..5d69763ded 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java index 90b4c120fa..0fd0065926 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLink.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLink.java index b0aa1e81ab..6b73f05f08 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLink.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLink.java @@ -28,13 +28,14 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class SectionDataElementLink implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkModel.java index beb5f3d1d7..4002ae9b92 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkModel.java @@ -28,13 +28,14 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class SectionDataElementLinkModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java index 6cef39f002..6c0df9a0f6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java index 391beb8e69..44a5537b4a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java index 873f712d95..c339fa6222 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java index a50092d674..cc561f09bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java index 6495766edd..c39159366e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLink.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLink.java index aa12b78d12..5c389c152a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLink.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLink.java @@ -29,13 +29,14 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class SectionGreyedFieldsLink implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkModel.java index d0c477be93..718f0b29eb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -37,6 +36,8 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class SectionGreyedFieldsLinkModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java index 926940b097..b066d047b1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java index 9f55dd432d..db29a258f6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java index 28b7f2d116..88037b65eb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.dataelement.DataElement; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionModel.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionModel.java index 411fc7cba3..9172c88127 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -37,6 +36,8 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class SectionModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java index 34f75f4550..50def5b89c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java @@ -29,16 +29,17 @@ package org.hisp.dhis.android.core.dataset; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; final class SectionStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java index 3b9d4af8e6..b9c8065109 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueStore.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java index 0d0047ae14..68ea5d84f0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration; import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java index 1af1c6de33..84e582baa8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java index baafefad46..69c836aefb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.ObjectStore; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.note.Note; import org.hisp.dhis.android.core.enrollment.note.NoteTableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStore.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStore.java index ccad9e271f..3d7b4954e3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java index 2fc4cb3908..082978432e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java @@ -34,9 +34,9 @@ import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.CoordinateHelper; import org.hisp.dhis.android.core.common.CursorModelFactory; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java index 9dc95d0966..77dd2db16e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java index 8c010d0883..4d13abe181 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java index 065ed17ce8..333d92f474 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteStore.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java index 9b0f8009fc..ba5e93625c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteUniquenessManager.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java index 80d0221b87..da06fab183 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.event; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -52,6 +51,8 @@ import java.util.Date; import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_Event.Builder.class) public abstract class Event extends BaseDataModel implements ObjectWithDeleteInterface, ObjectWithUidInterface { diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java index 701f7fdd6b..db9b479b3d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java index a0b80bd854..2499fd720f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository; +import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java index c3c37e08da..e0d51417b8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventEndpointCallFactory.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.event; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; @@ -38,6 +36,7 @@ import javax.inject.Inject; +import androidx.annotation.NonNull; import dagger.Reusable; import retrofit2.Call; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java index 01d479cadf..7bedfc1403 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.EnrollmentStore; import org.hisp.dhis.android.core.imports.EventImportSummary; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java index c508ace2fd..70fee3fa47 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventModel.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.event; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -42,6 +40,9 @@ import java.util.Date; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class EventModel extends BaseDataModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventModule.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventModule.java index 75c9dc859f..38612a5331 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventModule.java @@ -28,14 +28,13 @@ package org.hisp.dhis.android.core.event; -import androidx.annotation.VisibleForTesting; - import org.hisp.dhis.android.core.common.Unit; import java.util.concurrent.Callable; import javax.inject.Inject; +import androidx.annotation.VisibleForTesting; import dagger.Reusable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java index cc634712e0..c0f437a05d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java @@ -28,11 +28,9 @@ package org.hisp.dhis.android.core.event; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.maintenance.ForeignKeyCleaner; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; @@ -48,6 +46,7 @@ import javax.inject.Inject; +import androidx.annotation.NonNull; import dagger.Reusable; @Reusable diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java index 01520ed61a..ef5666f790 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java @@ -28,9 +28,6 @@ package org.hisp.dhis.android.core.event; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseQuery; @@ -39,6 +36,9 @@ import java.util.Collection; import java.util.Collections; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @AutoValue public abstract class EventQuery extends BaseQuery { diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStore.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStore.java index 589502610b..224679c8b5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java index f9b2adc81d..3c7c65f904 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java @@ -30,6 +30,8 @@ import android.database.Cursor; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; @@ -37,9 +39,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.CoordinateHelper; import org.hisp.dhis.android.core.common.CursorModelFactory; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.EnrollmentFields; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummaries.java b/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummaries.java index 0936a8b116..282580fd44 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummaries.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummaries.java @@ -28,11 +28,11 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.NonNull; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import androidx.annotation.NonNull; + public abstract class BaseImportSummaries { private static final String RESPONSE_TYPE = "responseType"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummary.java b/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummary.java index 047bed5bf4..87c0fd8a82 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummary.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/BaseImportSummary.java @@ -28,14 +28,14 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public abstract class BaseImportSummary implements ImportSummary { private static final String IMPORT_COUNT = "importCount"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/DataValueImportSummary.java b/core/src/main/java/org/hisp/dhis/android/core/imports/DataValueImportSummary.java index 587fbc0025..cba77378fe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/DataValueImportSummary.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/DataValueImportSummary.java @@ -28,15 +28,15 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import static org.hisp.dhis.android.core.utils.Utils.safeUnmodifiableList; @AutoValue diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummaries.java b/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummaries.java index 9e4f70fd45..e4637fecfb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummaries.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummaries.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @@ -37,6 +35,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_EnrollmentImportSummaries.Builder.class) public abstract class EnrollmentImportSummaries extends BaseImportSummaries implements ImportSummaries { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummary.java b/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummary.java index 4264e8c9d7..81b3536461 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummary.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/EnrollmentImportSummary.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.google.auto.value.AutoValue; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_EnrollmentImportSummary.Builder.class) public abstract class EnrollmentImportSummary extends BaseImportSummary { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/EventImportSummaries.java b/core/src/main/java/org/hisp/dhis/android/core/imports/EventImportSummaries.java index 1bee83d613..b3108c5011 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/EventImportSummaries.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/EventImportSummaries.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @@ -37,6 +35,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_EventImportSummaries.Builder.class) public abstract class EventImportSummaries extends BaseImportSummaries implements ImportSummaries { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/EventWebResponse.java b/core/src/main/java/org/hisp/dhis/android/core/imports/EventWebResponse.java index 0a77ef2b3f..b27c64d658 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/EventWebResponse.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/EventWebResponse.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.google.auto.value.AutoValue; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_EventWebResponse.Builder.class) public abstract class EventWebResponse extends WebResponse { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/ImportConflict.java b/core/src/main/java/org/hisp/dhis/android/core/imports/ImportConflict.java index 77b6807434..6a29bc03dc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/ImportConflict.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/ImportConflict.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.NonNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import com.google.auto.value.AutoValue; +import androidx.annotation.NonNull; + @AutoValue @JsonRootName("conflicts") public abstract class ImportConflict { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/ImportCount.java b/core/src/main/java/org/hisp/dhis/android/core/imports/ImportCount.java index dcb9673d5f..5452e71828 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/ImportCount.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/ImportCount.java @@ -28,12 +28,12 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.NonNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.value.AutoValue; +import androidx.annotation.NonNull; + @AutoValue public abstract class ImportCount { private static final String IMPORTED = "imported"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummaries.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummaries.java index ab907a6912..6713892967 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummaries.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummaries.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @@ -37,6 +35,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_TEIImportSummaries.Builder.class) public abstract class TEIImportSummaries extends BaseImportSummaries implements ImportSummaries { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummary.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummary.java index c424aa09a4..4cb1a447d1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummary.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TEIImportSummary.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.google.auto.value.AutoValue; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_TEIImportSummary.Builder.class) public abstract class TEIImportSummary extends BaseImportSummary { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TEIWebResponse.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TEIWebResponse.java index 5aa4e98e90..d8f6a7d63c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TEIWebResponse.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TEIWebResponse.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.google.auto.value.AutoValue; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_TEIWebResponse.Builder.class) public abstract class TEIWebResponse extends WebResponse { diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java index cae6c9672e..86e781c7df 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java index 7d820604f7..d1ef495c90 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.imports; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java index 48f2344124..45d90e146f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.imports; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.ObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/WebResponse.java b/core/src/main/java/org/hisp/dhis/android/core/imports/WebResponse.java index ad24410422..82ed867344 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/imports/WebResponse.java +++ b/core/src/main/java/org/hisp/dhis/android/core/imports/WebResponse.java @@ -28,10 +28,10 @@ package org.hisp.dhis.android.core.imports; -import androidx.annotation.NonNull; - import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import androidx.annotation.NonNull; + public abstract class WebResponse { @NonNull diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java index 86d41b74e9..abf7d0eac4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java index 616c52099b..7be94b397c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java index 7ed72a9f2d..e5370e28ca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java index b3ba77758e..95d4a4d64f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java index ef625c45a0..7d6a02c508 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java index f9c454ca58..1b233cf1e4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java index 775e39af6f..fcecd4bfe2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java index f158db492c..9fce2e5326 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java index b79b296ec4..00925b2805 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java index eb022c1808..a98b83a6ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class LegendChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java index e7fa8ce60b..cab62d97c6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java index 4b1cf5a987..f3ee54a884 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java index 86d0dc4338..36ad9fe93e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java index 4914c6d9ce..15fc8460db 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java index 5d7a3958b7..0ac80e16c4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java index 0d197b7bd1..595e782e34 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java index 4e3d8a49e7..723d1790e9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.legendset; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java index 689fd7dfb8..6aa8576d2f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java index c293747330..d6e1ce5fd2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java index c275777ffb..4b95ab7024 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.ObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerImpl.java index b2fb47ab57..c1f416418e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyCleanerImpl.java @@ -32,7 +32,7 @@ import android.util.Log; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java index 2444311322..61693e92ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java index 40daaa0a35..73d18b3fcb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java index edfb772e3c..13824fefb6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.ObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenancePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenancePackageDIModule.java index d54370ccc6..5c39767c6a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenancePackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenancePackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java index 62e78bcb03..6227723110 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.maintenance; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java index 537e6315c2..6a0294993b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java index e3d716b3d5..4284536453 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java index c5f88a955c..241ca24132 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java index 33ac542b4e..c357cd09cf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java index 817addf181..cc1f1d8515 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java index b95360ada5..e6ecb1e76f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionChildrenAppender.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class OptionGroupOptionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java index 473bf40163..869feddd88 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLink.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLink.java index e09a5ece4b..c1d8527cef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLink.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLink.java @@ -29,13 +29,14 @@ package org.hisp.dhis.android.core.option; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class OptionGroupOptionLink implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java index 510ad3a23d..d085d21050 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java index 734c168d13..9cdefafd62 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupOptionLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java index cec6ff97cc..86a71ecc87 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java @@ -29,15 +29,16 @@ package org.hisp.dhis.android.core.option; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; final class OptionGroupStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java index e35f0786e9..d580d62aa3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionModel.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionModel.java index dd21e5f219..e90c980751 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.option; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -37,6 +36,8 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class OptionModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSet.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSet.java index 5ca0961371..6adcdd094e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSet.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSet.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.option; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -45,6 +44,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_OptionSet.Builder.class) public abstract class OptionSet extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java index 6188cbe00d..647124bb80 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java index ee761c016d..6eba7c2b8f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java index 47ac7164ec..17cf861a6a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetModel.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetModel.java index f03226be85..294f268c2e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.option; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -40,6 +39,8 @@ import org.hisp.dhis.android.core.data.database.DbValueTypeColumnAdapter; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class OptionSetModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java index d89817ba82..55e91b2a9e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetOptionChildrenAppender.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class OptionSetOptionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java index 7687697bb1..08ddbde2ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetStore.java @@ -29,14 +29,15 @@ package org.hisp.dhis.android.core.option; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class OptionSetStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java index bd9f30475b..5b331f6b3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java @@ -32,9 +32,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java index be9864f02d..55d751bd70 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java index 86444c328f..ca6621bafe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDataSetChildrenAppender.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java index 075b617497..c013cdbdf8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java index 768e300591..e7b2e01c71 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.BaseNameableObject; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java index 8752baff81..6ba1997d51 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java index 3fc75884b3..fd92881eaf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java index 053099c329..85196e59db 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java index f172f515ef..17ee109e3e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java index a02be485a0..40b63f4d32 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java index 9d3bae9c5b..e89ab3dc6c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java index c321701867..b91505f10c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java index 0455534024..1bb32b012c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class OrganisationUnitOrganisationUnitGroupProgramChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java index db453787b1..69dc8d2488 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramChildrenAppender.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.program.Program; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkEntityDIModule.java index 8bec4dca00..0f9512f8a4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java index 6e0deac6b2..8eb3057c7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitProgramLinkStore.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java index 71179bc72d..59db27068f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java index c9f91d1439..92bb9512f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.user.User; import org.hisp.dhis.android.core.user.UserOrganisationUnitLink; import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkHelper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/Period.java b/core/src/main/java/org/hisp/dhis/android/core/period/Period.java index 828cd5436a..04ccabdad2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/Period.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/Period.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.period; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.google.auto.value.AutoValue; @@ -41,6 +40,8 @@ import java.util.Date; +import androidx.annotation.Nullable; + @AutoValue public abstract class Period implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodModel.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodModel.java index 1a10e96629..42c83c21fb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.period; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -42,6 +41,8 @@ import java.util.Date; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class PeriodModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStore.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStore.java index baa0eb894e..99d7a45d4f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.period; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Date; diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java index fce1f232c9..0d9ee761e3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodStoreImpl.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.period; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.common.SQLOrderType; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Date; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/Program.java b/core/src/main/java/org/hisp/dhis/android/core/program/Program.java index 016aa1fd72..bab4f325b7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/Program.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/Program.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -65,6 +64,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_Program.Builder.class) @SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.ExcessiveImports", "PMD.CouplingBetweenObjects", "PMD.GodClass"}) diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java index 782023b22f..a4cedfc67f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCategoryComboChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.category.CategoryCombo; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicator.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicator.java index d73c2fa42e..73b961c80f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicator.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicator.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -48,6 +47,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramIndicator.Builder.class) public abstract class ProgramIndicator extends BaseNameableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java index 1bed6404b3..c0ae89b5b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramIndicatorChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java index 1da033ec36..562013a45b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java index bf015f2140..d69cc6b0c1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java index 4e61a2da2a..163ad2038b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.legendset.LegendSet; import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java index d7064ed84f..bd44df5bdd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.legendset.LegendSet; import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java index fa5570b185..a8eb26e519 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorLegendSetEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.legendset.LegendSet; import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java index eb3bb8b149..098b635abf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -41,6 +39,9 @@ import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ProgramIndicatorModel extends BaseNameableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java index 0c4b7326f1..03a99443f4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java @@ -29,16 +29,17 @@ package org.hisp.dhis.android.core.program; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class ProgramIndicatorStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModel.java index 3c571a719b..5f8e0f1ce7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -41,6 +40,8 @@ import org.hisp.dhis.android.core.period.PeriodType; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.GodClass"}) @Deprecated @AutoValue diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRule.java index 96593436a6..573d89ed37 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRule.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -45,6 +44,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramRule.Builder.class) public abstract class ProgramRule extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleAction.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleAction.java index e5dcaf21a7..5416829e37 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleAction.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleAction.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -50,6 +49,8 @@ import org.hisp.dhis.android.core.dataelement.DataElement; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramRuleAction.Builder.class) public abstract class ProgramRuleAction extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java index b363141d31..f56805e468 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramRuleActionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java index 7c6b8bf625..27da67518b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java index c134288be2..7cfdfa9792 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionModel.java index 7e14d8dcf2..b0d99f89d6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionModel.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -38,6 +36,9 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ProgramRuleActionModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java index 28e6ead316..7cd89da9bd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java @@ -29,16 +29,17 @@ package org.hisp.dhis.android.core.program; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class ProgramRuleActionStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java index f0629a82c8..e907ad4189 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramRuleChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java index 97c6dbc2aa..c5b670dde0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java index 208f6e4fed..4b632ecd2f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java index ba8afaea1a..f6e7930e30 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleModel.java index dfd6d550f8..cc7d12c23a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -37,6 +36,8 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ProgramRuleModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java index 81e518b451..7d859a9d3f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java @@ -29,16 +29,17 @@ package org.hisp.dhis.android.core.program; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class ProgramRuleStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariable.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariable.java index 67c3f253be..161906e985 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariable.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariable.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @@ -42,6 +41,8 @@ import org.hisp.dhis.android.core.data.database.DbProgramRuleVariableSourceTypeColumnAdapter; import org.hisp.dhis.android.core.data.database.ObjectWithUidColumnAdapter; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramRuleVariable.Builder.class) public abstract class ProgramRuleVariable extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java index 1c2059ef09..3753b62a69 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramRuleVariableChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java index 7ff434cced..447c9f4148 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java index e88e0f7d88..3e218c1aa4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableModel.java index c7e853d9d1..7a6725f7ad 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -38,6 +37,8 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.data.database.DbProgramRuleVariableSourceTypeColumnAdapter; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ProgramRuleVariableModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java index f946608593..5ba53ccaf4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSection.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSection.java index d5b6885977..50b6521e80 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSection.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -47,6 +46,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramSection.Builder.class) public abstract class ProgramSection extends BaseIdentifiableObject diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java index 4a0ee5aaee..05bf9a086b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java index 6cbcd0cdea..3cedccf4cb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java index dc33211c7c..7c67046624 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionAttributeLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java index bb2d91d198..0647adbcac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramSectionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java index 119fb97a3e..9d0281fba9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java index f7c301d1d9..564fdbf1fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java index f93c804ce3..8df7a57796 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionModel.java index 7e9a029039..d6e03e568e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -37,6 +36,8 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class ProgramSectionModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java index 3f74a64c1b..6ae7116649 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java @@ -29,16 +29,17 @@ package org.hisp.dhis.android.core.program; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class ProgramSectionStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java index b209f72cb2..c14358d575 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -55,6 +54,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramStage.Builder.class) @SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.GodClass"}) diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java index fc72be51dd..f2e7ad73b2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramStageChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java index 6229c6a487..256d55b18a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.common.FormType; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.period.FeatureType; import org.hisp.dhis.android.core.period.PeriodType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElement.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElement.java index 7a4f3062ed..ed55f87b37 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElement.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElement.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @@ -45,6 +44,8 @@ import org.hisp.dhis.android.core.data.database.ObjectWithUidColumnAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = $$AutoValue_ProgramStageDataElement.Builder.class) public abstract class ProgramStageDataElement extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java index 4d3ae0e4e5..9c7193f9cb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramStageDataElementChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java index 1b3563fbd5..67e0846766 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java index b692fce9a9..42db920b2e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java index da3cba3de3..a792d3e97f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java index 737f0346e0..6f592ce2a5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java index 9c27c08ce0..575776695b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageModel.java index b4da504412..01fc063040 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageModel.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnAdapter; import com.gabrielittner.auto.value.cursor.ColumnName; @@ -44,6 +43,8 @@ import org.hisp.dhis.android.core.period.PeriodType; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.Nullable; + @SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.GodClass"}) @Deprecated @AutoValue diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java index 2b4f054d46..1ccce23181 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -49,6 +48,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_ProgramStageSection.Builder.class) public abstract class ProgramStageSection extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java index feabbdc514..b7004e556d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramStageSectionChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java index 799ff74bc2..6f29ad638b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java index 6105eeb000..215dedf1a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java index 94b77b8096..adac82b3d5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java index 91e3c8b601..b9ba6f5cd5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java index 259e0151ba..6ea54a7727 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java index 8e270b1fa4..272444bd72 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramStageSectionProgramIndicatorChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java index 5e295f666d..887a6111a9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java index d6e3149cd5..0e2049aca6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionProgramIndicatorLinkStore.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java index 8c5a3f1247..0c8cf5f9ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java index d4a7224366..521a4fae9a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java index 94c9508b48..06cb2c12c0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java @@ -29,17 +29,18 @@ package org.hisp.dhis.android.core.program; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.AccessHelper; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class ProgramStageStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java index f66ce9393a..7e03bbb4bd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java @@ -29,21 +29,22 @@ package org.hisp.dhis.android.core.program; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.AccessHelper; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; -import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class ProgramStore extends IdentifiableObjectStoreImpl implements ProgramStoreInterface { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStoreInterface.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStoreInterface.java index 0ca9251d98..d175b9104e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStoreInterface.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStoreInterface.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java index a68d8c0d9c..45b4edb6be 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramTrackedEntityAttributeChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java index 3f4edacbf3..08e1a400b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java index 10ec32571c..0c74ccb138 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java index 0879a79513..840a7e61b3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java index e58ea28fc1..307edb5848 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityTypeChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.trackedentity.TrackedEntityType; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java index 02b89a4539..7ccdcf3e6a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java index b31978d3f4..862403cd08 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java index 4e32850b6d..b699b291fd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStore.java index 54abdede07..319c424381 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java index 2a6acee009..cae4384a29 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStore.java index 428cd48fe2..bef249dc07 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java index 0b380f82c7..7559c038be 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipStoreImpl.java @@ -30,9 +30,9 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java index c59a91b616..f368807351 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java index a302a90f57..1b0acc8cef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java index 81d552cdf6..a176a61d1f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java index 72926c7fb3..4593953788 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStore.java b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStore.java index 2f558e01d5..90f36a1abd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStore.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.resource; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; public interface ResourceStore extends ObjectWithoutUidStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java index 2645c5ba83..d65da35e4e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/resource/ResourceStoreImpl.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java index b9a024177f..10d2fd815d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java index 4e7c082f43..f0901fcb65 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java index 6b8d787c75..e26a0f24b0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersionManager.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersionManager.java index a8a00812d5..7d52f64020 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersionManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersionManager.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.systeminfo; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java index 7c1be5b705..82e7ecc25e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoEntityDIModule.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java index b3fb8b00b0..0ce99ac705 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyFirstObjectWithDownloadRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java index 11ba7e68ae..43e73e3688 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java index 30a0adcc73..ed3366a09a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java index f91124e288..7c0f04b739 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java index ee61ee964b..807e438d97 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java index 1177445df0..b846614553 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.D2CallExecutor; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java index cdf0d677a4..760f8ff6ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStore.java @@ -32,8 +32,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo.Columns; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreInterface.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreInterface.java index a3889cd5d0..1edadb4ac6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreInterface.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueStoreInterface.java @@ -31,7 +31,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Date; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java index 7745f4c669..5813eff17d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java @@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java index 6b22c23c36..6a3a9b737b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public final class TrackedEntityAttributeValueChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStore.java index 00fd787d91..69b75d4d8f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStore.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java index daae66cc04..0506446e3d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreImpl.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java index 6a03d0eee2..fae9e78ac1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.event.Event; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStore.java index 6a44ce246f..472fa8b237 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStore.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java index e36fa2b92d..0f3cefdb23 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java @@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.CursorModelFactory; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java index 84216f75ba..135f8b4d21 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.EnrollmentImportHandler; import org.hisp.dhis.android.core.imports.EnrollmentImportSummaries; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePersistenceCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePersistenceCallFactory.java index 7cadc3d34e..82d502cff1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePersistenceCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePersistenceCallFactory.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModuleDownloader; import org.hisp.dhis.android.core.user.AuthenticatedUser; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java index 0a51e671ee..ccf589596c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceRelationshipPersistenceCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceRelationshipPersistenceCallFactory.java index 87c9c88a03..b41f73c493 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceRelationshipPersistenceCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceRelationshipPersistenceCallFactory.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.maintenance.ForeignKeyCleaner; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModuleDownloader; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStore.java index 237f0a0949..4a0f596741 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStore; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java index 9a41b51d4b..8922e4598e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceStoreImpl.java @@ -31,9 +31,9 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperImpl.java index f71df00167..b6f3cce721 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperImpl.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.enrollment.Enrollment; import org.hisp.dhis.android.core.event.Event; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java index 19269186fd..dc5f344ec6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceWithLimitCallFactory.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.api.OuMode; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java index 35b25e236b..647a274ef4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeChildrenAppender.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public final class TrackedEntityTypeAttributeChildrenAppender extends ChildrenAppender { diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java index b193a63084..d12666b86a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java index 94cab9b939..3b4e1bd523 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java index e17006c7ff..08a8b5fc8e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeStore.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.LinkModelStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java index e930197f95..697fc3ac8e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java index 769b92f72b..d552a5ad2b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java index 65dcf9e339..574fbed6e3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java index 288fdfe4fd..7b6f82ae97 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; public final class TrackedEntityTypeStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUser.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUser.java index a8b160a4ef..b7759654b6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUser.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUser.java @@ -29,13 +29,14 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class AuthenticatedUser implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java index 4cc57c062f..f09af6b6a6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserEntityDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserModel.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserModel.java index e8a07599b0..a16be07793 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserModel.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -38,6 +36,9 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class AuthenticatedUserModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java index 60d726b90b..2d4327003c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java index fa9c048183..ec94519e03 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/Authority.java b/core/src/main/java/org/hisp/dhis/android/core/user/Authority.java index def28413a3..d55b051407 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/Authority.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/Authority.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -39,6 +38,8 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_Authority.Builder.class) public abstract class Authority implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java index 430555b225..c969e0ca0e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java @@ -28,8 +28,6 @@ package org.hisp.dhis.android.core.user; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.maintenance.D2Error; @@ -37,6 +35,8 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; + abstract class AuthorityCallFetcher implements CallFetcher { private final APICallExecutor apiCallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java index 7aa4ad3541..94bca8459d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java index a2cc22225a..a571b3b7ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java index c4b9993422..abe37e28aa 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityStore.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallable.java b/core/src/main/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallable.java index b0594f36fe..b1c6f6e777 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallable.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallable.java @@ -28,14 +28,14 @@ package org.hisp.dhis.android.core.user; -import androidx.annotation.NonNull; - -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import java.util.concurrent.Callable; import javax.inject.Inject; +import androidx.annotation.NonNull; + final class IsUserLoggedInCallable implements Callable { @NonNull diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/LogOutUserCallable.java b/core/src/main/java/org/hisp/dhis/android/core/user/LogOutUserCallable.java index b1acfc8113..675f41918e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/LogOutUserCallable.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/LogOutUserCallable.java @@ -28,9 +28,7 @@ package org.hisp.dhis.android.core.user; -import androidx.annotation.NonNull; - -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; @@ -40,6 +38,8 @@ import javax.inject.Inject; +import androidx.annotation.NonNull; + class LogOutUserCallable implements Callable { @NonNull diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/User.java b/core/src/main/java/org/hisp/dhis/android/core/user/User.java index e9df14e8db..28f5c5960c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/User.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/User.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; @@ -45,6 +43,9 @@ import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_User.Builder.class) public abstract class User extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java index 5cd5c558ba..078c6cd443 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserAuthenticateCallFactory.java @@ -32,8 +32,8 @@ import org.hisp.dhis.android.core.arch.api.internal.APIUrlProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentials.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentials.java index e6aba4aa9a..2df816cf46 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentials.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentials.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +44,8 @@ import java.util.List; +import androidx.annotation.Nullable; + @AutoValue @JsonDeserialize(builder = AutoValue_UserCredentials.Builder.class) public abstract class UserCredentials extends BaseIdentifiableObject implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsModel.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsModel.java index c6e2c89ab4..4e20eab21d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsModel.java @@ -30,13 +30,14 @@ import android.database.Cursor; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class UserCredentialsModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStore.java index 4734ac83cb..cb12e2bca2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStore.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; public interface UserCredentialsStore extends IdentifiableObjectStore { UserCredentials getForUser(String userId); diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java index c5c1a2d1dc..04aa73cda9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java @@ -29,17 +29,18 @@ package org.hisp.dhis.android.core.user; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.SQLStatementWrapper; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; public final class UserCredentialsStoreImpl extends IdentifiableObjectStoreImpl diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java index 7b2929a964..78ec67dc84 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserEntityDIModule.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java index bda3eb0dde..3abc163935 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserInternalModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserInternalModule.java index 2e6e83eb0c..503319a202 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserInternalModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserInternalModule.java @@ -28,10 +28,9 @@ package org.hisp.dhis.android.core.user; -import androidx.annotation.VisibleForTesting; - import javax.inject.Inject; +import androidx.annotation.VisibleForTesting; import dagger.Reusable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserModel.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserModel.java index d458e6fd19..0d60357e82 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserModel.java @@ -29,14 +29,15 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class UserModel extends BaseIdentifiableObjectModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java index ddf0e7da44..0b129027ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java index 7546f0423f..fb17560004 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitChildrenAppender.java @@ -29,8 +29,8 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelChildStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLink.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLink.java index 1a8384fd4c..860bd75510 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLink.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLink.java @@ -29,13 +29,14 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.common.Model; +import androidx.annotation.Nullable; + @AutoValue public abstract class UserOrganisationUnitLink implements Model { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkHelper.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkHelper.java index fc62f50f44..3e3ea76170 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkHelper.java @@ -28,13 +28,13 @@ package org.hisp.dhis.android.core.user; -import androidx.annotation.NonNull; - import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.organisationunit.OrganisationUnitTree.findRoots; public final class UserOrganisationUnitLinkHelper { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkModel.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkModel.java index c83271f784..bb33e9fb1d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkModel.java @@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.user; import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.gabrielittner.auto.value.cursor.ColumnName; import com.google.auto.value.AutoValue; @@ -38,6 +36,9 @@ import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.utils.Utils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @Deprecated @AutoValue public abstract class UserOrganisationUnitLinkModel extends BaseModel { diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStore.java index 0834cec29d..0aa605c120 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java index d68f007ab4..6893e511f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkStoreImpl.java @@ -30,9 +30,9 @@ import android.database.sqlite.SQLiteStatement; +import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.LinkModelStoreImpl; -import org.hisp.dhis.android.core.common.SQLStatementBuilder; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStoreImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo.Columns; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java index 51a751d51c..8de9b425c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserOrganisationUnitLinkTableInfo.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; +import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; import org.hisp.dhis.android.core.common.BaseModel; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java index bcf0e54fcf..bb06da8917 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleChildrenAppender.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java index 751f350606..1940e0c153 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl; import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory; import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Map; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java index bdbaf31149..014ca2669e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.CollectionCleanerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java index 4eab6e2d19..3332c04bed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleStore.java @@ -29,14 +29,15 @@ package org.hisp.dhis.android.core.user; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + public final class UserRoleStore { private UserRoleStore() {} diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java index 2e02760f62..e0b1a86890 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserStore.java @@ -29,14 +29,15 @@ package org.hisp.dhis.android.core.user; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; +import androidx.annotation.NonNull; + import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; final class UserStore { diff --git a/core/src/main/java/org/hisp/dhis/android/core/utils/CodeGeneratorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/utils/CodeGeneratorImpl.java index 23dd41ed8c..1e04277a59 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/utils/CodeGeneratorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/utils/CodeGeneratorImpl.java @@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.utils; -import androidx.annotation.NonNull; - import java.util.Random; +import androidx.annotation.NonNull; + public final class CodeGeneratorImpl implements CodeGenerator { private static final String LETTERS = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; diff --git a/core/src/main/java/org/hisp/dhis/android/core/utils/StoreUtils.java b/core/src/main/java/org/hisp/dhis/android/core/utils/StoreUtils.java index a921c5d023..2070513a45 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/utils/StoreUtils.java +++ b/core/src/main/java/org/hisp/dhis/android/core/utils/StoreUtils.java @@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.utils; import android.database.sqlite.SQLiteStatement; -import androidx.annotation.NonNull; import org.hisp.dhis.android.core.common.BaseIdentifiableObject; import org.hisp.dhis.android.core.common.State; @@ -38,6 +37,8 @@ import java.text.ParseException; import java.util.Date; +import androidx.annotation.NonNull; + /** * Provides helper functions to handle null checks and type conversions. */ diff --git a/core/src/main/java/org/hisp/dhis/android/core/utils/Utils.java b/core/src/main/java/org/hisp/dhis/android/core/utils/Utils.java index f0f744b7be..2b90009c16 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/utils/Utils.java +++ b/core/src/main/java/org/hisp/dhis/android/core/utils/Utils.java @@ -28,9 +28,6 @@ package org.hisp.dhis.android.core.utils; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import org.hisp.dhis.android.core.common.ObjectWithDeleteInterface; import java.util.ArrayList; @@ -41,6 +38,9 @@ import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * A collection of utility abstractions */ diff --git a/core/src/main/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngine.java b/core/src/main/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngine.java index 867be96618..5f228cc7ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngine.java +++ b/core/src/main/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngine.java @@ -31,7 +31,7 @@ import org.apache.commons.jexl2.JexlException; import org.hisp.dhis.android.core.common.AggregationType; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; import org.hisp.dhis.android.core.constant.Constant; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java index 6ee7ad9913..937cf8723c 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/internal/APICallExecutorShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.api.internal; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderShould.java similarity index 98% rename from core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java rename to core/src/test/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderShould.java index 39c9fee1a2..22ddb90e8f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/SQLStatementBuilderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderShould.java @@ -25,10 +25,12 @@ * (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.common; +package org.hisp.dhis.android.core.arch.db.querybuilders.internal; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.category.CategoryTableInfo; +import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo; import org.hisp.dhis.android.core.dataset.DataSetTableInfo; import org.hisp.dhis.android.core.legendset.LegendSetTableInfo; diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java index 227b2d7b0c..b0ca7cc6e2 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper; import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem; import org.hisp.dhis.android.core.category.CategoryOption; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java index c9a205cbe2..df37050059 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java index d28b416a30..141ecd3c6b 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java index 146d786434..45ad3cee78 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; import org.assertj.core.util.Lists; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.calls.MetadataCall; import org.hisp.dhis.android.core.category.CategoryModuleDownloader; import org.hisp.dhis.android.core.constant.Constant; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerShould.java index 7da10c7d10..f1430c5d22 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerShould.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorShould.java b/core/src/test/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorShould.java index 93f2568693..7a5f5054ef 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/data/api/BasicAuthenticatorShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.data.api; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.user.AuthenticatedUser; import org.junit.After; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java index b63b2b4d0a..f8b8c12e93 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataelement/DataElementHandlerShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataelement; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java index 52dd4b698d..bbd5d8a430 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java index 28590d04ed..a0aaa62a62 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandlerShould.java index 353d4540e1..4316362c90 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandlerShould.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.common.ObjectStore; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.note.Note; import org.hisp.dhis.android.core.event.EventImportHandler; diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventImportHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/event/EventImportHandlerShould.java index 40fecc7852..7fed17ba7f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/event/EventImportHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventImportHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.EnrollmentStore; import org.hisp.dhis.android.core.imports.EventImportSummary; diff --git a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java index 7587917906..f899452e48 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsServiceShould.java b/core/src/test/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsServiceShould.java index e7a808b5cd..f12f31f6c1 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsServiceShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsServiceShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.maintenance; import org.assertj.core.util.Lists; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.program.Program; import org.hisp.dhis.android.core.program.ProgramRule; diff --git a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java index aa1e6a6c20..f2a8061b8e 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java index c2857c8fc0..d25013672e 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerShould.java @@ -31,8 +31,8 @@ import org.assertj.core.util.Sets; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.LinkModelStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink; diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerShould.java index 0c405bd687..33993d2c0a 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.assertj.core.util.Lists; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.user.User; import org.hisp.dhis.android.core.user.UserOrganisationUnitLink; import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkStore; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java index 4665299f94..60709abd2e 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.legendset.LegendSet; import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java index bb3a6c37d0..8f96b288fe 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrphanCleaner; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java index 3a0a57ec17..01de6ef874 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionHandlerShould.java @@ -31,7 +31,7 @@ import org.assertj.core.util.Lists; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java index 7f5955e7b8..1fd846258a 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.dataelement.DataElement; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java index bdb6ef0823..18ade75dc8 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.common.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.OrphanCleaner; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java index d7e87d1ba8..8655a68b7b 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java index fbca58f9fb..0255cc6bf0 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DictionaryTableHandler; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java index 9b219bfd99..622ece44eb 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandlerShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandlerShould.java index da9ba052a6..75b963122c 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandlerShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.common.ObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.EnrollmentImportHandler; import org.hisp.dhis.android.core.imports.EnrollmentImportSummaries; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperShould.java index e6c2db80ea..f9392494f6 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceUidHelperShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.assertj.core.util.Lists; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.enrollment.Enrollment; import org.hisp.dhis.android.core.event.Event; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallableShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallableShould.java index 47f4a5cf87..8170d54498 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallableShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/IsUserLoggedInCallableShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/LogOutUserCallableShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/LogOutUserCallableShould.java index cfc9112500..e0d2fc0204 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/LogOutUserCallableShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/LogOutUserCallableShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.user; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java index 05b7d5debe..b983bc688c 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserAuthenticateCallUnitShould.java @@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; import org.hisp.dhis.android.core.common.BaseCallShould; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.ObjectWithoutUidStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.data.api.Fields; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java index b463391776..530dafd7e5 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineShould.java b/core/src/test/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineShould.java index 48f00d10e5..dc7b08fab4 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/utils/services/ProgramIndicatorEngineShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.utils.services; import org.hisp.dhis.android.core.common.AggregationType; -import org.hisp.dhis.android.core.common.IdentifiableObjectStore; +import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueType; import org.hisp.dhis.android.core.constant.Constant; import org.hisp.dhis.android.core.dataelement.DataElement; From bfdf7a625d1faa39f8334d0aaf123da9a9a2377b Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Fri, 31 May 2019 17:50:26 +0200 Subject: [PATCH 024/155] Move cleaners to arch --- .../OrganisationUnitCallMockIntegrationShould.java | 4 ++-- .../cleaners/internal}/CollectionCleaner.java | 4 +++- .../cleaners/internal}/CollectionCleanerImpl.java | 5 ++++- .../cleaners/internal}/DataOrphanCleanerImpl.java | 6 +++++- .../{common => arch/cleaners/internal}/OrphanCleaner.java | 4 +++- .../cleaners/internal}/OrphanCleanerImpl.java | 5 ++++- .../cleaners/internal}/ParentOrphanCleaner.java | 4 +++- .../core/category/CategoryComboEntityDIModule.java | 4 ++-- .../dhis/android/core/category/CategoryComboHandler.java | 2 +- .../hisp/dhis/android/core/constant/ConstantHandler.java | 2 +- .../android/core/constant/ConstantPackageDIModule.java | 4 ++-- .../dhis/android/core/dataset/DataSetEntityDIModule.java | 8 ++++---- .../hisp/dhis/android/core/dataset/DataSetHandler.java | 4 ++-- .../android/core/enrollment/EnrollmentEntityDIModule.java | 4 ++-- .../dhis/android/core/enrollment/EnrollmentHandler.java | 2 +- .../android/core/legendset/LegendSetEntityDIModule.java | 4 ++-- .../dhis/android/core/legendset/LegendSetHandler.java | 2 +- .../android/core/option/OptionGroupEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/option/OptionGroupHandler.java | 2 +- .../dhis/android/core/option/OptionSetEntityDIModule.java | 4 ++-- .../hisp/dhis/android/core/option/OptionSetHandler.java | 2 +- .../organisationunit/OrganisationUnitCallFactory.java | 2 +- .../OrganisationUnitGroupEntityDIModule.java | 4 ++-- .../dhis/android/core/program/ProgramEntityDIModule.java | 6 +++--- .../hisp/dhis/android/core/program/ProgramHandler.java | 4 ++-- .../dhis/android/core/program/ProgramOrphanCleaner.java | 6 +++--- .../android/core/program/ProgramRuleEntityDIModule.java | 4 ++-- .../dhis/android/core/program/ProgramRuleHandler.java | 2 +- .../android/core/program/ProgramStageEntityDIModule.java | 8 ++++---- .../dhis/android/core/program/ProgramStageHandler.java | 4 ++-- .../TrackedEntityInstanceEntityDIModule.java | 4 ++-- .../core/trackedentity/TrackedEntityInstanceHandler.java | 2 +- .../java/org/hisp/dhis/android/core/user/UserHandler.java | 2 +- .../dhis/android/core/user/UserRoleEntityDIModule.java | 4 ++-- .../android/core/category/CategoryComboHandlerShould.java | 2 +- .../dhis/android/core/dataset/DataSetHandlerShould.java | 4 ++-- .../android/core/enrollment/EnrollmentHandlerShould.java | 2 +- .../android/core/legendset/LegendSetHandlerShould.java | 2 +- .../dhis/android/core/option/OptionSetHandlerShould.java | 2 +- .../organisationunit/OrganisationUnitCallUnitShould.java | 2 +- .../dhis/android/core/program/ProgramHandlerShould.java | 4 ++-- .../android/core/program/ProgramRuleHandlerShould.java | 2 +- .../android/core/program/ProgramStageHandlerShould.java | 4 ++-- .../trackedentity/TrackedEntityInstanceHandlerShould.java | 2 +- .../hisp/dhis/android/core/user/UserHandlerShould.java | 2 +- 45 files changed, 88 insertions(+), 72 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/cleaners/internal}/CollectionCleaner.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/cleaners/internal}/CollectionCleanerImpl.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/cleaners/internal}/DataOrphanCleanerImpl.java (90%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/cleaners/internal}/OrphanCleaner.java (93%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/cleaners/internal}/OrphanCleanerImpl.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/cleaners/internal}/ParentOrphanCleaner.java (93%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java index b34f9c7b0a..41afaeffcb 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallMockIntegrationShould.java @@ -36,8 +36,8 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.organisationunit.OrganisationUnitSamples; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/CollectionCleaner.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/common/CollectionCleaner.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.java index e6348c5128..b4880d6199 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/CollectionCleaner.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.java @@ -26,7 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.cleaners.internal; + +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/CollectionCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/common/CollectionCleanerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java index 1d53dbfd12..af7d9e7106 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/CollectionCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java @@ -26,8 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.cleaners.internal; +import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; +import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/DataOrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java similarity index 90% rename from core/src/main/java/org/hisp/dhis/android/core/common/DataOrphanCleanerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java index ce79d3ee4a..73e8006738 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/DataOrphanCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java @@ -26,8 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.cleaners.internal; +import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; +import org.hisp.dhis.android.core.common.State; +import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/OrphanCleaner.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/common/OrphanCleaner.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.java index 6994021ed2..4cb8e38c13 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/OrphanCleaner.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.java @@ -26,7 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.cleaners.internal; + +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/OrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/common/OrphanCleanerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java index b5fd703ffb..64805800ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/OrphanCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java @@ -26,8 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.cleaners.internal; +import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; +import org.hisp.dhis.android.core.common.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ParentOrphanCleaner.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/common/ParentOrphanCleaner.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.java index a50c73316e..5eca605a45 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ParentOrphanCleaner.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.java @@ -26,7 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.cleaners.internal; + +import org.hisp.dhis.android.core.common.IdentifiableObject; public interface ParentOrphanCleaner

{ void deleteOrphan(P parent); diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java index 26dac9bbc6..270c30edc7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java @@ -32,8 +32,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java index 1c3e83842c..73fb032427 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java index d3a14131af..ec3eefe351 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.constant; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java index 35b58c8535..c8417269ab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java index fe77c18d38..5ed34a5e6e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java @@ -30,13 +30,13 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.indicator.DataSetIndicatorChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java index 61201ab5d0..367be5d14a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java @@ -30,12 +30,12 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.dataelement.DataElementOperand; import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink; import org.hisp.dhis.android.core.indicator.Indicator; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java index 2a919cbc40..cdc85bb902 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.DataOrphanCleanerImpl; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.note.NoteChildrenAppender; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java index 7f6424cb7e..5847d9098e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.note.Note; import org.hisp.dhis.android.core.enrollment.note.NoteDHISVersionManager; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java index 36ad9fe93e..08288d08b9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java index 15fc8460db..7c3f96368e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java index c357cd09cf..4d00a0c49c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupEntityDIModule.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java index cc1f1d8515..d9a627711e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java index 6eba7c2b8f..2bbf1ba420 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetEntityDIModule.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java index 17cf861a6a..c9ead5e4ce 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java index 174c13e1c7..a1d982a3b4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallFactory.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java index 6ba1997d51..8e0ea3fdb7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupEntityDIModule.java @@ -32,8 +32,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java index bb09b0690c..286bdaadab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEntityDIModule.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; -import org.hisp.dhis.android.core.common.ParentOrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java index f63eadeceb..f608e0f45f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java @@ -30,10 +30,10 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectStyleHandler; -import org.hisp.dhis.android.core.common.ParentOrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramOrphanCleaner.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramOrphanCleaner.java index acd0b8fb87..1d86dbe84d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramOrphanCleaner.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramOrphanCleaner.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; -import org.hisp.dhis.android.core.common.ParentOrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; final class ProgramOrphanCleaner implements ParentOrphanCleaner { diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java index 4b632ecd2f..1adf84c02c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEntityDIModule.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java index f6e7930e30..cfefe990be 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java index 6f592ce2a5..2d398caa92 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEntityDIModule.java @@ -31,13 +31,13 @@ import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; import org.hisp.dhis.android.core.common.ObjectStyleStoreImpl; -import org.hisp.dhis.android.core.common.OrphanCleaner; -import org.hisp.dhis.android.core.common.OrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.HashMap; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java index 575776695b..e8a5ec193a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java @@ -30,12 +30,12 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.period.FeatureType; import org.hisp.dhis.android.core.systeminfo.DHISVersionManager; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java index f0b5c13a6a..fc4bc37ec5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceEntityDIModule.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.DataOrphanCleanerImpl; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java index 11906ed714..9142726f6c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java index 3abc163935..e8d04ffee4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java index 014ca2669e..4f4401bb2f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleEntityDIModule.java @@ -32,8 +32,8 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.common.CollectionCleaner; -import org.hisp.dhis.android.core.common.CollectionCleanerImpl; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java index df37050059..7fa3f74597 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java index bbd5d8a430..c9a7e53675 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java @@ -31,12 +31,12 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.dataelement.DataElementOperand; import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink; diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java index 360ee00906..7b19dadf4c 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils; import org.hisp.dhis.android.core.enrollment.note.Note; diff --git a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java index f899452e48..8f8335754a 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java index f2a8061b8e..928853d53b 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java index 2d24f25564..4adcd48aab 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java index 8793650549..f9ee96173b 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.Access; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectStyleHandler; -import org.hisp.dhis.android.core.common.ParentOrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner; import org.hisp.dhis.android.core.trackedentity.TrackedEntityType; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java index 8f96b288fe..9093befba7 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java index 18ade75dc8..258c782821 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java @@ -31,13 +31,13 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.Access; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleHandler; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.period.FeatureType; import org.hisp.dhis.android.core.systeminfo.DHISVersionManager; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java index b7f5ab87a5..80a774ac7f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.common.HandleAction; -import org.hisp.dhis.android.core.common.OrphanCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.enrollment.Enrollment; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java index 530dafd7e5..a050524252 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/UserHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.CollectionCleaner; +import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.junit.Before; import org.junit.Test; From 9ae652595ea46254f0a41b008a9fa5b767381397 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 14:48:23 +0200 Subject: [PATCH 025/155] Move queries to arch --- .../core/{common => arch/call/queries/internal}/BaseQuery.java | 2 +- .../core/{common => arch/call/queries/internal}/EmptyQuery.java | 2 +- .../core/{common => arch/call/queries/internal}/UidsQuery.java | 2 +- .../dhis/android/core/calls/factories/QueryCallFactory.java | 2 +- .../dhis/android/core/calls/factories/QueryCallFactoryImpl.java | 2 +- .../android/core/calls/fetchers/UidsNoResourceCallFetcher.java | 2 +- .../android/core/category/CategoryComboEndpointCallFactory.java | 2 +- .../dhis/android/core/category/CategoryEndpointCallFactory.java | 2 +- .../hisp/dhis/android/core/dataapproval/DataApprovalQuery.java | 2 +- .../core/dataelement/DataElementEndpointCallFactory.java | 2 +- .../android/core/dataset/DataSetCompleteRegistrationQuery.java | 2 +- .../org/hisp/dhis/android/core/datavalue/DataValueQuery.java | 2 +- .../main/java/org/hisp/dhis/android/core/event/EventQuery.java | 2 +- .../android/core/indicator/IndicatorEndpointCallFactory.java | 2 +- .../core/indicator/IndicatorTypeEndpointCallFactory.java | 2 +- .../hisp/dhis/android/core/option/OptionGroupCallFactory.java | 2 +- .../org/hisp/dhis/android/core/option/OptionSetCallFactory.java | 2 +- .../SearchOrganisationUnitOnDemandCallFactory.java | 2 +- .../android/core/program/ProgramRuleEndpointCallFactory.java | 2 +- .../android/core/program/ProgramStageEndpointCallFactory.java | 2 +- .../java/org/hisp/dhis/android/core/trackedentity/TeiQuery.java | 2 +- .../trackedentity/TrackedEntityAttributeReservedValueQuery.java | 2 +- .../core/trackedentity/TrackedEntityTypeCallFactory.java | 2 +- .../core/trackedentity/search/TrackedEntityInstanceQuery.java | 2 +- .../trackedentity/search/TrackedEntityInstanceQueryOnline.java | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/call/queries/internal}/BaseQuery.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/call/queries/internal}/EmptyQuery.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/call/queries/internal}/UidsQuery.java (96%) diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/BaseQuery.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/common/BaseQuery.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java index f1b08348b2..260ea75e44 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/BaseQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.call.queries.internal; public abstract class BaseQuery { public static final int DEFAULT_PAGE_SIZE = 50; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/EmptyQuery.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/EmptyQuery.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/common/EmptyQuery.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/EmptyQuery.java index dfa3024063..b6e94e73c4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/EmptyQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/EmptyQuery.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.call.queries.internal; import com.google.auto.value.AutoValue; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/UidsQuery.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/UidsQuery.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/common/UidsQuery.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/UidsQuery.java index 580633b604..160bb238bd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/UidsQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/UidsQuery.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.call.queries.internal; import com.google.auto.value.AutoValue; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java index c65a52cf42..ba7dc92ff8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.calls.factories; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import java.util.List; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java index 1152f9cc1c..6ef18f8b23 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.calls.EndpointCall; import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.common.GenericCallData; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java index adab93705f..45bfdcb933 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.utils.Utils; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java index 390dc23187..0765b95d10 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java index 144f8bbd97..61371a2f82 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalQuery.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalQuery.java index 44d1ba4816..0992bab396 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalQuery.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import java.util.Collection; import java.util.Date; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java index f54fb95abf..d4ed47ecb2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationQuery.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationQuery.java index e552cc9e85..7dc92fb03f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationQuery.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueQuery.java index 053d3070ae..21018d35b8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueQuery.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java index ef5666f790..d3d37c89a7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventQuery.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.data.api.OuMode; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java index e70a2657d8..49da113ff0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java index e5ac526794..d0bd202db1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java index 7778d92110..b575dee14a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java index 9fc4da0904..d8f8e41784 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java index 3d22a7e3a4..9121452a34 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.calls.processors.CallProcessor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import org.hisp.dhis.android.core.user.User; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java index 6580a8fc24..6566a5d975 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java index d55f380cd3..317f66ce39 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TeiQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TeiQuery.java index 12533de003..de2e4973cb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TeiQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TeiQuery.java @@ -33,7 +33,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.data.api.OuMode; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueQuery.java index d6e9408d47..8599b0abff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueQuery.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import javax.annotation.Nullable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java index 793c406cc8..bdbd7c6a9d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; -import org.hisp.dhis.android.core.common.UidsQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQuery.java index 007aa2b084..7a663169ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQuery.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQuery.java @@ -33,7 +33,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.common.SafeDateFormat; import org.hisp.dhis.android.core.data.api.OuMode; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.java index 91449cbfa6..d9336938a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.java @@ -30,7 +30,7 @@ import com.google.auto.value.AutoValue; -import org.hisp.dhis.android.core.common.BaseQuery; +import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.common.SafeDateFormat; import org.hisp.dhis.android.core.data.api.OuMode; From d6e3e68b2d206dde3db88557ed617df6f5bfdf9f Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 14:52:12 +0200 Subject: [PATCH 026/155] Move helpers to arch --- .../core/category/CategoryModuleMockIntegrationShould.java | 2 +- .../core/event/EventPostCallMockIntegrationShould.java | 2 +- .../TrackedEntityInstancePostCallMockIntegrationShould.java | 2 +- .../core/arch/cleaners/internal/CollectionCleanerImpl.java | 2 +- .../core/arch/cleaners/internal/DataOrphanCleanerImpl.java | 2 +- .../core/arch/cleaners/internal/OrphanCleanerImpl.java | 2 +- .../android/core/{common => arch/helpers}/AccessHelper.java | 4 +++- .../core/{common => arch/helpers}/CoordinateHelper.java | 4 +++- .../android/core/{common => arch/helpers}/UidsHelper.java | 4 +++- .../android/core/category/CategoryOptionComboStoreImpl.java | 2 +- .../hisp/dhis/android/core/category/CategoryOptionStore.java | 2 +- .../dhis/android/core/data/database/AccessColumnAdapter.java | 2 +- .../core/data/database/IdentifiableObjectColumnAdapter.java | 2 +- .../android/core/dataelement/DataElementOperandStore.java | 2 +- .../dhis/android/core/dataset/DataInputPeriodLinkStore.java | 2 +- .../android/core/dataset/DataSetDataElementLinkStore.java | 2 +- .../java/org/hisp/dhis/android/core/dataset/DataSetStore.java | 4 ++-- .../java/org/hisp/dhis/android/core/dataset/SectionStore.java | 2 +- .../dhis/android/core/enrollment/EnrollmentStoreImpl.java | 2 +- .../java/org/hisp/dhis/android/core/event/EventStoreImpl.java | 2 +- .../org/hisp/dhis/android/core/indicator/IndicatorStore.java | 2 +- .../org/hisp/dhis/android/core/legendset/LegendStore.java | 2 +- .../android/core/maintenance/PerformanceHintsService.java | 2 +- .../org/hisp/dhis/android/core/option/OptionGroupStore.java | 2 +- .../java/org/hisp/dhis/android/core/option/OptionStore.java | 2 +- .../organisationunit/OrganisationUnitModuleDownloader.java | 2 +- .../android/core/organisationunit/OrganisationUnitStore.java | 2 +- .../hisp/dhis/android/core/program/ProgramIndicatorStore.java | 2 +- .../dhis/android/core/program/ProgramModuleDownloader.java | 2 +- .../dhis/android/core/program/ProgramParentUidsHelper.java | 2 +- .../dhis/android/core/program/ProgramRuleActionStore.java | 2 +- .../org/hisp/dhis/android/core/program/ProgramRuleStore.java | 2 +- .../dhis/android/core/program/ProgramRuleVariableStore.java | 2 +- .../hisp/dhis/android/core/program/ProgramSectionStore.java | 2 +- .../android/core/program/ProgramStageDataElementStore.java | 2 +- .../dhis/android/core/program/ProgramStageSectionStore.java | 2 +- .../org/hisp/dhis/android/core/program/ProgramStageStore.java | 4 ++-- .../java/org/hisp/dhis/android/core/program/ProgramStore.java | 4 ++-- .../core/program/ProgramTrackedEntityAttributeStore.java | 2 +- .../core/relationship/RelationshipCollectionRepository.java | 2 +- .../core/relationship/RelationshipConstraintStore.java | 2 +- .../android/core/relationship/RelationshipItemStoreImpl.java | 2 +- .../core/trackedentity/TrackedEntityAttributeStore.java | 2 +- .../core/trackedentity/TrackedEntityInstancePostCall.java | 2 +- .../hisp/dhis/android/core/user/UserCredentialsStoreImpl.java | 2 +- .../hisp/dhis/android/core/dataset/DataInputPeriodShould.java | 2 +- .../hisp/dhis/android/core/program/ProgramSectionShould.java | 2 +- 47 files changed, 56 insertions(+), 50 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/helpers}/AccessHelper.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/helpers}/CoordinateHelper.java (94%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/helpers}/UidsHelper.java (95%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryModuleMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryModuleMockIntegrationShould.java index 28405e0190..9775b95e29 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryModuleMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/CategoryModuleMockIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher; import org.hisp.dhis.android.core.utils.runner.D2JunitRunner; import org.junit.Test; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallMockIntegrationShould.java index 9c38c2bdf6..1a22e6fbf5 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventPostCallMockIntegrationShould.java @@ -31,7 +31,7 @@ import com.google.common.collect.Lists; import org.hisp.dhis.android.core.common.State; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.trackedentity.TrackedEntityDataValueSamples; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallMockIntegrationShould.java index 9530b8de30..6fe8b2b950 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallMockIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCallMockIntegrationShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.State; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.relationship.RelationshipSamples; import org.hisp.dhis.android.core.data.trackedentity.TrackedEntityDataValueSamples; import org.hisp.dhis.android.core.data.trackedentity.TrackedEntityInstanceSamples; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java index af7d9e7106..5b12bb6beb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java index 73e8006738..dba420887f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.State; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java index 64805800ab..3dd41b4692 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collection; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/AccessHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/AccessHelper.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/common/AccessHelper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/helpers/AccessHelper.java index 8692623305..24ca805aab 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/AccessHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/AccessHelper.java @@ -25,7 +25,9 @@ * (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.common; +package org.hisp.dhis.android.core.arch.helpers; + +import org.hisp.dhis.android.core.common.Access; public final class AccessHelper { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/CoordinateHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/CoordinateHelper.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/common/CoordinateHelper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/helpers/CoordinateHelper.java index 3a6c511ddf..8bda011c9e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/CoordinateHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/CoordinateHelper.java @@ -25,7 +25,9 @@ * (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.common; +package org.hisp.dhis.android.core.arch.helpers; + +import org.hisp.dhis.android.core.common.Coordinates; public final class CoordinateHelper { diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/UidsHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.java similarity index 95% rename from core/src/main/java/org/hisp/dhis/android/core/common/UidsHelper.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.java index 6a4c858dc8..49b7d867ac 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/UidsHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.java @@ -25,8 +25,10 @@ * (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.common; +package org.hisp.dhis.android.core.arch.helpers; +import org.hisp.dhis.android.core.common.IdentifiableObject; +import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.utils.Utils; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java index db46113803..945aeb24d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboStoreImpl.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java index 361ceebc1f..347f0c6d26 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionStore.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.AccessHelper; +import org.hisp.dhis.android.core.arch.helpers.AccessHelper; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/database/AccessColumnAdapter.java b/core/src/main/java/org/hisp/dhis/android/core/data/database/AccessColumnAdapter.java index 00a1f64168..8ac1069541 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/data/database/AccessColumnAdapter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/data/database/AccessColumnAdapter.java @@ -34,7 +34,7 @@ import com.gabrielittner.auto.value.cursor.ColumnTypeAdapter; import org.hisp.dhis.android.core.common.Access; -import org.hisp.dhis.android.core.common.AccessHelper; +import org.hisp.dhis.android.core.arch.helpers.AccessHelper; public class AccessColumnAdapter implements ColumnTypeAdapter { diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectColumnAdapter.java b/core/src/main/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectColumnAdapter.java index bd44ad93a0..36dd7d347b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectColumnAdapter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectColumnAdapter.java @@ -34,7 +34,7 @@ import com.gabrielittner.auto.value.cursor.ColumnTypeAdapter; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import io.reactivex.annotations.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java index f235b3530d..23e14c3c8b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandStore.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java index 02a7723795..2aa7736e9d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodLinkStore.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java index 74929d81f1..274e53ed37 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDataElementLinkStore.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java index b3ca97e8bf..c70592fe84 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetStore.java @@ -33,9 +33,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.AccessHelper; +import org.hisp.dhis.android.core.arch.helpers.AccessHelper; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java index 50def5b89c..6c37308fb4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java index 082978432e..5fa8f5d2ee 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.CoordinateHelper; +import org.hisp.dhis.android.core.arch.helpers.CoordinateHelper; import org.hisp.dhis.android.core.common.CursorModelFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java index 3c7c65f904..29cb359aef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java @@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; -import org.hisp.dhis.android.core.common.CoordinateHelper; +import org.hisp.dhis.android.core.arch.helpers.CoordinateHelper; import org.hisp.dhis.android.core.common.CursorModelFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java index 1b233cf1e4..389cb1d5bb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java index 595e782e34..33faee9a2c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java index 6227723110..08dc102bb7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java +++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.maintenance; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.organisationunit.OrganisationUnit; import org.hisp.dhis.android.core.organisationunit.OrganisationUnitStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java index 86a71ecc87..873502dfaf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupStore.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java index 5b331f6b3f..4598dabadf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitModuleDownloader.java index 46bcb88156..b267e36e9f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitModuleDownloader.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.organisationunit; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.common.Unit; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.program.Program; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java index 59db27068f..7220a4bfb3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java index 03a99443f4..ca4217f808 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java index b976d1afcd..738fbd5cca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; import org.hisp.dhis.android.core.calls.factories.ListCallFactory; import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.option.OptionGroup; import org.hisp.dhis.android.core.option.OptionSet; import org.hisp.dhis.android.core.relationship.RelationshipType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramParentUidsHelper.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramParentUidsHelper.java index ceb454a4c3..340d6d7862 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramParentUidsHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramParentUidsHelper.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import java.util.HashSet; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java index 7cd89da9bd..a52e0d3d99 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java index 7d859a9d3f..f477ceb798 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java index 5ba53ccaf4..c5bfe1842c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableStore.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java index 6ae7116649..d57726e48f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java index a792d3e97f..3489196fc1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java index 0c8cf5f9ef..c10c212028 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionStore.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java index 06cb2c12c0..1892104663 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageStore.java @@ -34,9 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.AccessHelper; +import org.hisp.dhis.android.core.arch.helpers.AccessHelper; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java index 7e03bbb4bd..ea53a004d5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStore.java @@ -35,10 +35,10 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.AccessHelper; +import org.hisp.dhis.android.core.arch.helpers.AccessHelper; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java index 840a7e61b3..02299e949d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeStore.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java index ea316ddfb1..1a2e29200f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.StoreWithState; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; import org.hisp.dhis.android.core.maintenance.D2ErrorComponent; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java index b699b291fd..aa7be7e8bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipConstraintStore.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java index cae4384a29..3bbff89ed7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipItemStoreImpl.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java index 5813eff17d..6cad439c00 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeStore.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java index ccf589596c..a5b37ffd30 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstancePostCall.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.enrollment.Enrollment; import org.hisp.dhis.android.core.enrollment.EnrollmentStore; import org.hisp.dhis.android.core.enrollment.note.Note; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java index 04aa73cda9..64ce11a7c1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsStoreImpl.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import androidx.annotation.NonNull; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataInputPeriodShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataInputPeriodShould.java index 6d9c589362..6037abcad4 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataInputPeriodShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataInputPeriodShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.common.BaseObjectShould; import org.hisp.dhis.android.core.common.ObjectShould; import org.hisp.dhis.android.core.common.SafeDateFormat; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.junit.Test; import java.io.IOException; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionShould.java index ab126fd21d..6607bd4547 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramSectionShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.BaseObjectShould; import org.hisp.dhis.android.core.common.ObjectShould; import org.hisp.dhis.android.core.common.ObjectStyle; -import org.hisp.dhis.android.core.common.UidsHelper; +import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.junit.Test; import java.io.IOException; From 551a632bcd02008272929fe20d1cdbf7da17c61b Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:00:49 +0200 Subject: [PATCH 027/155] Move calls package --- ...ibuteReservedValueManagerRealIntegrationShould.java | 2 +- .../java/org/hisp/dhis/android/core/D2DIComponent.java | 6 +++--- .../call/factories/internal}/ListCallFactory.java | 2 +- .../call/factories/internal}/ListCallFactoryImpl.java | 8 ++++---- .../call/factories/internal}/QueryCallFactory.java | 2 +- .../call/factories/internal}/QueryCallFactoryImpl.java | 8 ++++---- .../call/factories/internal}/UidsCallFactory.java | 2 +- .../call/factories/internal}/UidsCallFactoryImpl.java | 8 ++++---- .../call/fetchers/internal}/CallFetcher.java | 2 +- .../fetchers/internal}/ListNoResourceCallFetcher.java | 2 +- .../ListNoResourceWithErrorCatcherCallFetcher.java | 2 +- .../internal}/PayloadNoResourceCallFetcher.java | 2 +- .../fetchers/internal}/PayloadResourceCallFetcher.java | 2 +- .../fetchers/internal}/UidsNoResourceCallFetcher.java | 2 +- .../{calls => arch/call/internal}/EndpointCall.java | 6 +++--- .../call/processors/internal}/CallProcessor.java | 2 +- .../TransactionalNoResourceSyncCallProcessor.java | 2 +- .../TransactionalResourceSyncCallProcessor.java | 2 +- .../category/CategoryComboEndpointCallFactory.java | 10 +++++----- .../core/category/CategoryEndpointCallFactory.java | 10 +++++----- .../android/core/category/CategoryInternalModule.java | 2 +- .../core/category/CategoryModuleDownloader.java | 2 +- .../android/core/category/CategoryPackageDIModule.java | 2 +- .../android/core/constant/ConstantCallFactory.java | 10 +++++----- .../android/core/constant/ConstantPackageDIModule.java | 2 +- .../core/dataapproval/DataApprovalCallFactory.java | 10 +++++----- .../core/dataapproval/DataApprovalPackageDIModule.java | 2 +- .../dataelement/DataElementEndpointCallFactory.java | 10 +++++----- .../core/dataelement/DataElementPackageDIModule.java | 2 +- .../DataSetCompleteRegistrationCallFactory.java | 8 ++++---- .../DataSetCompleteRegistrationCallFetcher.java | 2 +- .../core/dataset/DataSetEndpointCallFactory.java | 10 +++++----- .../android/core/dataset/DataSetModuleDownloader.java | 4 ++-- .../android/core/dataset/DataSetPackageDIModule.java | 4 ++-- .../core/datavalue/DataValueEndpointCallFactory.java | 10 +++++----- .../core/datavalue/DataValuePackageDIModule.java | 2 +- .../domain/aggregated/data/AggregatedDataCall.java | 2 +- .../core/{calls => domain/metadata}/MetadataCall.java | 2 +- .../core/indicator/IndicatorEndpointCallFactory.java | 10 +++++----- .../core/indicator/IndicatorPackageDIModule.java | 2 +- .../indicator/IndicatorTypeEndpointCallFactory.java | 10 +++++----- .../android/core/option/OptionGroupCallFactory.java | 10 +++++----- .../android/core/option/OptionPackageDIModule.java | 2 +- .../dhis/android/core/option/OptionSetCallFactory.java | 10 +++++----- .../OrganisationUnitLevelEndpointCallFactory.java | 10 +++++----- .../OrganisationUnitLevelEntityDIModule.java | 2 +- .../SearchOrganisationUnitOnDemandCallFactory.java | 8 ++++---- .../core/program/ProgramEndpointCallFactory.java | 10 +++++----- .../android/core/program/ProgramModuleDownloader.java | 4 ++-- .../android/core/program/ProgramPackageDIModule.java | 4 ++-- .../core/program/ProgramRuleEndpointCallFactory.java | 10 +++++----- .../core/program/ProgramStageEndpointCallFactory.java | 10 +++++----- .../core/relationship/RelationshipPackageDIModule.java | 2 +- .../RelationshipTypeEndpointCallFactory.java | 10 +++++----- ...ackedEntityAttributeReservedValueCallProcessor.java | 2 +- ...ntityAttributeReservedValueEndpointCallFactory.java | 8 ++++---- .../TrackedEntityAttributeReservedValueManager.java | 2 +- .../trackedentity/TrackedEntityPackageDIModule.java | 4 ++-- .../trackedentity/TrackedEntityTypeCallFactory.java | 10 +++++----- .../dhis/android/core/user/AuthorityCallFetcher.java | 2 +- .../dhis/android/core/user/AuthorityCallProcessor.java | 2 +- .../core/user/AuthorityEndpointCallFactory.java | 6 +++--- .../core/common/EndpointPayloadCallAbstractShould.java | 2 +- .../dhis/android/core/common/MetadataCallShould.java | 2 +- .../core/program/ProgramEndpointCallShould.java | 6 +++--- .../core/program/ProgramModuleDownloaderShould.java | 4 ++-- .../android/core/user/AuthorityEndpointCallShould.java | 2 +- 67 files changed, 167 insertions(+), 167 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{calls/factories => arch/call/factories/internal}/ListCallFactory.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/factories => arch/call/factories/internal}/ListCallFactoryImpl.java (89%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/factories => arch/call/factories/internal}/QueryCallFactory.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/factories => arch/call/factories/internal}/QueryCallFactoryImpl.java (89%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/factories => arch/call/factories/internal}/UidsCallFactory.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/factories => arch/call/factories/internal}/UidsCallFactoryImpl.java (89%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/fetchers => arch/call/fetchers/internal}/CallFetcher.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/fetchers => arch/call/fetchers/internal}/ListNoResourceCallFetcher.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/fetchers => arch/call/fetchers/internal}/ListNoResourceWithErrorCatcherCallFetcher.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/fetchers => arch/call/fetchers/internal}/PayloadNoResourceCallFetcher.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/fetchers => arch/call/fetchers/internal}/PayloadResourceCallFetcher.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/fetchers => arch/call/fetchers/internal}/UidsNoResourceCallFetcher.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls => arch/call/internal}/EndpointCall.java (92%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/processors => arch/call/processors/internal}/CallProcessor.java (96%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/processors => arch/call/processors/internal}/TransactionalNoResourceSyncCallProcessor.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls/processors => arch/call/processors/internal}/TransactionalResourceSyncCallProcessor.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{calls => domain/metadata}/MetadataCall.java (99%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java index f7497d0b8c..784f3d298a 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import org.hisp.dhis.android.core.category.CategoryCombo; import org.hisp.dhis.android.core.category.CategoryComboTableInfo; import org.hisp.dhis.android.core.common.Access; diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java index 9f9608243e..0d433dd05f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java +++ b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java @@ -33,9 +33,9 @@ import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.di.internal.RepositoriesDIModule; -import org.hisp.dhis.android.core.calls.MetadataCall; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.domain.metadata.MetadataCall; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import org.hisp.dhis.android.core.category.CategoryOption; import org.hisp.dhis.android.core.category.CategoryPackageDIModule; import org.hisp.dhis.android.core.common.CommonPackageDIModule; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.java index c07fffd361..0761f91253 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.factories; +package org.hisp.dhis.android.core.arch.call.factories.internal; import java.util.List; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java similarity index 89% rename from core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java index 2af656c657..4c28e4575a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/ListCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java @@ -26,12 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.factories; +package org.hisp.dhis.android.core.arch.call.factories.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.calls.EndpointCall; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java index ba7dc92ff8..54941c40f9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.factories; +package org.hisp.dhis.android.core.arch.call.factories.internal; import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java similarity index 89% rename from core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java index 6ef18f8b23..70d1694019 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/QueryCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java @@ -26,12 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.factories; +package org.hisp.dhis.android.core.arch.call.factories.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.calls.EndpointCall; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; import org.hisp.dhis.android.core.common.GenericCallData; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.java index d08648463b..b8081f5cb3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.factories; +package org.hisp.dhis.android.core.arch.call.factories.internal; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java similarity index 89% rename from core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java index 1076338bf4..aae48d331e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/factories/UidsCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java @@ -26,12 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.factories; +package org.hisp.dhis.android.core.arch.call.factories.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.calls.EndpointCall; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/CallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CallFetcher.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/CallFetcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CallFetcher.java index f3756645bf..b8a155e721 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/CallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CallFetcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.fetchers; +package org.hisp.dhis.android.core.arch.call.fetchers.internal; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceCallFetcher.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceCallFetcher.java index 16cc4cce58..3c9a9740f5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceCallFetcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.fetchers; +package org.hisp.dhis.android.core.arch.call.fetchers.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java index 219d17fe53..7b4b2e5286 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/ListNoResourceWithErrorCatcherCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.fetchers; +package org.hisp.dhis.android.core.arch.call.fetchers.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallErrorCatcher; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java index 3bd0483570..b45fdc10ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.fetchers; +package org.hisp.dhis.android.core.arch.call.fetchers.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadResourceCallFetcher.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadResourceCallFetcher.java index cadb5c1eaa..f793e3d550 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/PayloadResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadResourceCallFetcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.fetchers; +package org.hisp.dhis.android.core.arch.call.fetchers.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java index 45bfdcb933..64f6d07acc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/fetchers/UidsNoResourceCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.fetchers; +package org.hisp.dhis.android.core.arch.call.fetchers.internal; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java index c978482d31..500a851764 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/EndpointCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls; +package org.hisp.dhis.android.core.arch.call.internal; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import java.util.List; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/CallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/CallProcessor.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/calls/processors/CallProcessor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/CallProcessor.java index 3fda027c77..90ee0e39f4 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/CallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/CallProcessor.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.processors; +package org.hisp.dhis.android.core.arch.call.processors.internal; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java index 1f1b103106..007b64985d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalNoResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.processors; +package org.hisp.dhis.android.core.arch.call.processors.internal; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.D2CallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java index a1dc42c84b..b700d79dde 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/processors/TransactionalResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.calls.processors; +package org.hisp.dhis.android.core.arch.call.processors.internal; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.D2CallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java index 0765b95d10..3a7c91fdbe 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java @@ -31,11 +31,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java index 61371a2f82..8405de8926 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java @@ -31,11 +31,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryInternalModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryInternalModule.java index e9a193ea51..1dba1ec7eb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryInternalModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryInternalModule.java @@ -29,7 +29,7 @@ import androidx.annotation.VisibleForTesting; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java index 72a90432c9..1519251a90 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryModuleDownloader.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import org.hisp.dhis.android.core.common.Unit; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryPackageDIModule.java index e054036959..ccff5c3ff1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java index 8b1a52fb2b..853e158c59 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java index c8417269ab..b5120e935c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java index 25d2baedd4..82cdfd354b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.ListNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import java.text.SimpleDateFormat; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalPackageDIModule.java index 4a942a8484..ec7e894eb5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataapproval; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java index d4ed47ecb2..2fa4b49304 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementPackageDIModule.java index ae7a9a008b..0aeab2eb75 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java index 5f14eb9c75..3f786eb4d8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java @@ -30,10 +30,10 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java index edb93be288..b8156f20ea 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFetcher.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; import org.hisp.dhis.android.core.maintenance.D2ErrorComponent; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java index 38c13f36d9..a3aba4cb38 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.PayloadResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java index bd10ce8f65..02ecff2ff6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModuleDownloader.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import org.hisp.dhis.android.core.dataelement.DataElement; import org.hisp.dhis.android.core.indicator.Indicator; import org.hisp.dhis.android.core.indicator.IndicatorType; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetPackageDIModule.java index fe81edbd48..fc1417a6bc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetPackageDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java index d21d109b44..39eedf3670 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.PayloadResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePackageDIModule.java index 15494dd8b7..0a00ffa5ef 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValuePackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java index 68ea5d84f0..ea03dcad3e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCall.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.call.D2Progress; import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.dataset.DataSet; import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration; diff --git a/core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.java similarity index 99% rename from core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java rename to core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.java index 755516ba65..3833ea4121 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/calls/MetadataCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.java @@ -25,7 +25,7 @@ * (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.calls; +package org.hisp.dhis.android.core.domain.metadata; import org.hisp.dhis.android.core.category.CategoryModuleDownloader; import org.hisp.dhis.android.core.common.D2CallExecutor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java index 49da113ff0..76f5490fec 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorPackageDIModule.java index 62ddf56da9..0aa12062d9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java index d0bd202db1..58b448e32a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java index b575dee14a..cb07ea9268 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionPackageDIModule.java index c2475b2b9a..7ee747ef02 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java index d8f8e41784..e38e76aba0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java index 03bd5242ab..c3a2cca3ed 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java index 40b63f4d32..397ceca1b2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEntityDIModule.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java index 9121452a34..b8676d67a8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitOnDemandCallFactory.java @@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.organisationunit; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.calls.EndpointCall; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java index a4376d86a8..f89186cd96 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java index 738fbd5cca..951d7a2997 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramModuleDownloader.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.modules.internal.MetadataModuleDownloader; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import org.hisp.dhis.android.core.arch.helpers.UidsHelper; import org.hisp.dhis.android.core.option.OptionGroup; import org.hisp.dhis.android.core.option.OptionSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramPackageDIModule.java index 57347898e4..3bded87fc8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramPackageDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java index 6566a5d975..cf2382fef5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java index 317f66ce39..52a3bfeac0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipPackageDIModule.java index 4b2dd1a4f1..9e52276e49 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.relationship; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; import dagger.Module; import dagger.Provides; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java index 4581e73dac..55bf56974d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.PayloadResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java index 5c43bd09af..575482ffb8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueCallProcessor.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java index 8156420446..f05a8e34f6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java @@ -30,10 +30,10 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.ListNoResourceWithErrorCatcherCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java index b846614553..45f5ea5c20 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java index 11608804fd..a2c7f60362 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.trackedentity; -import org.hisp.dhis.android.core.calls.factories.QueryCallFactory; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryEntityDIModule; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java index bdbd7c6a9d..091ea7a691 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java @@ -29,11 +29,11 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.fetchers.UidsNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java index c969e0ca0e..742e5610d2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallFetcher.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.maintenance.D2Error; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java index 22fab37f32..2930b6b249 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCallProcessor.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.user; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.maintenance.D2Error; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java index 0d61e1171f..dbd9838c12 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java @@ -30,9 +30,9 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.factories.ListCallFactoryImpl; -import org.hisp.dhis.android.core.calls.fetchers.CallFetcher; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.common.GenericCallData; import java.util.List; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/EndpointPayloadCallAbstractShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/EndpointPayloadCallAbstractShould.java index ebd752e79e..3a5d69f234 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/EndpointPayloadCallAbstractShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/EndpointPayloadCallAbstractShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.calls.processors.CallProcessor; +import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.maintenance.D2ErrorCode; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java index 45ad3cee78..dec2c2322b 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/MetadataCallShould.java @@ -29,7 +29,7 @@ import org.assertj.core.util.Lists; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; -import org.hisp.dhis.android.core.calls.MetadataCall; +import org.hisp.dhis.android.core.domain.metadata.MetadataCall; import org.hisp.dhis.android.core.category.CategoryModuleDownloader; import org.hisp.dhis.android.core.constant.Constant; import org.hisp.dhis.android.core.constant.ConstantModuleDownloader; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java index dd432b0698..913bad9bba 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramEndpointCallShould.java @@ -30,9 +30,9 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.EndpointCall; -import org.hisp.dhis.android.core.calls.fetchers.PayloadNoResourceCallFetcher; -import org.hisp.dhis.android.core.calls.processors.TransactionalNoResourceSyncCallProcessor; +import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; +import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; +import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramModuleDownloaderShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramModuleDownloaderShould.java index 207ecc2586..c4df9a5606 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramModuleDownloaderShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramModuleDownloaderShould.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.program; -import org.hisp.dhis.android.core.calls.factories.ListCallFactory; -import org.hisp.dhis.android.core.calls.factories.UidsCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; +import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory; import org.hisp.dhis.android.core.common.BaseCallShould; import org.hisp.dhis.android.core.option.OptionGroup; import org.hisp.dhis.android.core.option.OptionSet; diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java index 0fe45073f2..81a7314d10 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.calls.EndpointCall; +import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; import org.hisp.dhis.android.core.common.BaseCallShould; import org.junit.Before; import org.junit.Test; From fa394e34c86290a7de31d01469273abb0ed0a392 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:08:05 +0200 Subject: [PATCH 028/155] Move GenericCallData --- .../IdentifiableObjectStoreAbstractIntegrationShould.java | 2 +- .../ObjectWithoutUidStoreAbstractIntegrationShould.java | 2 +- .../core/utils/integration/real/BaseRealIntegrationTest.java | 2 +- .../core/arch/call/factories/internal/ListCallFactoryImpl.java | 2 +- .../core/arch/call/factories/internal/QueryCallFactoryImpl.java | 2 +- .../core/arch/call/factories/internal/UidsCallFactoryImpl.java | 2 +- .../core/{common => arch/call/internal}/GenericCallData.java | 2 +- .../internal/TransactionalResourceSyncCallProcessor.java | 2 +- .../core/arch/db/stores/internal/IdentifiableObjectStore.java | 2 +- .../arch/db/stores/internal/IdentifiableObjectStoreImpl.java | 2 +- .../stores/internal/IdentifiableObjectWithStateStoreImpl.java | 2 +- .../core/arch/db/stores/internal/ObjectWithoutUidStore.java | 2 +- .../core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java | 2 +- .../core/{common => arch/handlers/internal}/HandleAction.java | 2 +- .../arch/handlers/internal/IdentifiableSyncHandlerImpl.java | 1 - .../arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java | 1 - .../core/arch/handlers/internal/SyncHandlerBaseImpl.java | 1 - .../android/core/category/CategoryComboEndpointCallFactory.java | 2 +- .../hisp/dhis/android/core/category/CategoryComboHandler.java | 2 +- .../dhis/android/core/category/CategoryEndpointCallFactory.java | 2 +- .../org/hisp/dhis/android/core/category/CategoryHandler.java | 2 +- .../dhis/android/core/category/CategoryOptionComboHandler.java | 2 +- .../hisp/dhis/android/core/common/CommonPackageDIModule.java | 1 + .../java/org/hisp/dhis/android/core/common/StoreWithState.java | 2 ++ .../hisp/dhis/android/core/constant/ConstantCallFactory.java | 2 +- .../dhis/android/core/dataapproval/DataApprovalCallFactory.java | 2 +- .../core/dataelement/DataElementEndpointCallFactory.java | 2 +- .../hisp/dhis/android/core/dataelement/DataElementHandler.java | 2 +- .../core/dataset/DataSetCompleteRegistrationCallFactory.java | 2 +- .../dhis/android/core/dataset/DataSetEndpointCallFactory.java | 2 +- .../java/org/hisp/dhis/android/core/dataset/DataSetHandler.java | 2 +- .../java/org/hisp/dhis/android/core/dataset/SectionHandler.java | 2 +- .../android/core/datavalue/DataValueEndpointCallFactory.java | 2 +- .../hisp/dhis/android/core/enrollment/EnrollmentHandler.java | 2 +- .../dhis/android/core/enrollment/EnrollmentImportHandler.java | 2 +- .../java/org/hisp/dhis/android/core/event/EventHandler.java | 2 +- .../org/hisp/dhis/android/core/event/EventImportHandler.java | 2 +- .../android/core/indicator/IndicatorEndpointCallFactory.java | 2 +- .../core/indicator/IndicatorTypeEndpointCallFactory.java | 2 +- .../org/hisp/dhis/android/core/legendset/LegendSetHandler.java | 2 +- .../hisp/dhis/android/core/option/OptionGroupCallFactory.java | 2 +- .../org/hisp/dhis/android/core/option/OptionGroupHandler.java | 2 +- .../java/org/hisp/dhis/android/core/option/OptionHandler.java | 2 +- .../org/hisp/dhis/android/core/option/OptionSetCallFactory.java | 2 +- .../org/hisp/dhis/android/core/option/OptionSetHandler.java | 2 +- .../core/organisationunit/OrganisationUnitHandlerImpl.java | 2 +- .../OrganisationUnitLevelEndpointCallFactory.java | 2 +- .../organisationunit/SearchOrganisationUnitHandlerImpl.java | 2 +- .../dhis/android/core/program/ProgramEndpointCallFactory.java | 2 +- .../java/org/hisp/dhis/android/core/program/ProgramHandler.java | 2 +- .../hisp/dhis/android/core/program/ProgramIndicatorHandler.java | 2 +- .../android/core/program/ProgramRuleEndpointCallFactory.java | 2 +- .../org/hisp/dhis/android/core/program/ProgramRuleHandler.java | 2 +- .../hisp/dhis/android/core/program/ProgramSectionHandler.java | 2 +- .../android/core/program/ProgramStageDataElementHandler.java | 2 +- .../android/core/program/ProgramStageEndpointCallFactory.java | 2 +- .../org/hisp/dhis/android/core/program/ProgramStageHandler.java | 2 +- .../dhis/android/core/program/ProgramStageSectionHandler.java | 2 +- .../core/program/ProgramTrackedEntityAttributeHandler.java | 2 +- .../core/relationship/RelationshipTypeEndpointCallFactory.java | 2 +- .../dhis/android/core/relationship/RelationshipTypeHandler.java | 2 +- .../core/trackedentity/TrackedEntityAttributeHandler.java | 2 +- .../TrackedEntityAttributeReservedValueEndpointCallFactory.java | 2 +- .../core/trackedentity/TrackedEntityInstanceHandler.java | 2 +- .../core/trackedentity/TrackedEntityInstanceImportHandler.java | 2 +- .../core/trackedentity/TrackedEntityTypeCallFactory.java | 2 +- .../android/core/trackedentity/TrackedEntityTypeHandler.java | 2 +- .../dhis/android/core/user/AuthorityEndpointCallFactory.java | 2 +- .../src/main/java/org/hisp/dhis/android/core/user/UserCall.java | 2 +- .../main/java/org/hisp/dhis/android/core/user/UserHandler.java | 2 +- .../dhis/android/core/category/CategoryComboHandlerShould.java | 2 +- .../java/org/hisp/dhis/android/core/common/BaseCallShould.java | 1 + .../hisp/dhis/android/core/dataset/DataSetHandlerShould.java | 2 +- .../dhis/android/core/enrollment/EnrollmentHandlerShould.java | 2 +- .../org/hisp/dhis/android/core/event/EventHandlerShould.java | 2 +- .../dhis/android/core/legendset/LegendSetHandlerShould.java | 2 +- .../hisp/dhis/android/core/option/OptionSetHandlerShould.java | 2 +- .../core/organisationunit/OrganisationUnitCallUnitShould.java | 2 +- .../hisp/dhis/android/core/program/ProgramHandlerShould.java | 2 +- .../dhis/android/core/program/ProgramRuleHandlerShould.java | 2 +- .../dhis/android/core/program/ProgramStageHandlerShould.java | 2 +- .../hisp/dhis/android/core/resource/ResourceHandlerShould.java | 2 +- .../core/trackedentity/TrackedEntityInstanceHandlerShould.java | 2 +- 83 files changed, 81 insertions(+), 80 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/call/internal}/GenericCallData.java (97%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/handlers/internal}/HandleAction.java (96%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java index fd9ac80034..112a61c4eb 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.data.database; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java index 360fee90ea..112be787a8 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.data.database; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.junit.Before; diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/real/BaseRealIntegrationTest.java b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/real/BaseRealIntegrationTest.java index c19637008e..4cdb8dd632 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/real/BaseRealIntegrationTest.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/real/BaseRealIntegrationTest.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.D2DIComponent; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.DbOpenHelper; import org.hisp.dhis.android.core.data.database.SqLiteDatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java index 4c28e4575a..6a451114e3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import java.util.List; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java index 70d1694019..b4488a582a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import java.util.List; import java.util.concurrent.Callable; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java index aae48d331e..128091c2f8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.call.internal.EndpointCall; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/GenericCallData.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/GenericCallData.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/common/GenericCallData.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/GenericCallData.java index 25d3494c1c..a98ad0d125 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/GenericCallData.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/GenericCallData.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.call.internal; import com.google.auto.value.AutoValue; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java index b700d79dde..d1882b2c21 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.D2CallExecutor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java index bcdd887185..f04cb69f7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java index 425c5b0a6a..c9ee3eea27 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.CursorModelFactory; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java index 17e38fe855..2497298ca2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.CursorModelFactory; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java index 1768deba0f..5cc724228c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStore.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java index 9453cb0465..87c101ea1b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.common.CursorModelFactory; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/HandleAction.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/common/HandleAction.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.java index 1953a98106..ed953cb09d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/HandleAction.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.handlers.internal; public enum HandleAction { Insert, Update, Delete diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java index 641603b370..329bf1574a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java @@ -28,7 +28,6 @@ package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.ObjectWithDeleteInterface; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java index 8ce59ad158..bd57409a91 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java @@ -28,7 +28,6 @@ package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Model; public class ObjectWithoutUidSyncHandlerImpl extends SyncHandlerBaseImpl { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java index c52bda7fc7..65084f5173 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java @@ -27,7 +27,6 @@ */ package org.hisp.dhis.android.core.arch.handlers.internal; -import org.hisp.dhis.android.core.common.HandleAction; import org.hisp.dhis.android.core.common.Transformer; import java.util.ArrayList; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java index 3a7c91fdbe..959b20f0b2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java index 73fb032427..c7fabcbce8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java index 8405de8926..106857d60e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java index a2f3e7775b..7d9ee5338c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java index f687329d5f..568e9f2352 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/CommonPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/CommonPackageDIModule.java index d84a26bbf8..965c553a53 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/CommonPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/CommonPackageDIModule.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.resource.ResourceHandler; import org.hisp.dhis.android.core.systeminfo.DHISVersionManager; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/StoreWithState.java b/core/src/main/java/org/hisp/dhis/android/core/common/StoreWithState.java index bd5be0be44..e73175cb5a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/StoreWithState.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/StoreWithState.java @@ -28,6 +28,8 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; + import androidx.annotation.NonNull; public interface StoreWithState { diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java index 853e158c59..89d6ff2e19 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java index 82cdfd354b..70b8c311a0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import java.text.SimpleDateFormat; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java index 2fa4b49304..6683a91f48 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.Access; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java index 69de3df90b..cf29115453 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataelement; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java index 3f786eb4d8..66ca52678b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java index a3aba4cb38..f10f393534 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java index 367be5d14a..85053591d6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java index 88037b65eb..4680621743 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java index 39eedf3670..7a654109e1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java index 5847d9098e..df48c21835 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.note.Note; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java index 69c836aefb..4cecb15248 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentImportHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.common.BaseDataModel; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java index 646c4074a1..029c7e37e2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java index 7bedfc1403..5a7555bddc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventImportHandler.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.EnrollmentStore; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java index 76f5490fec..107810cdc0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java index 58b448e32a..32402cd7c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java index 7c3f96368e..8abdbc74fc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java index cb07ea9268..d5f845ebba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java index d9a627711e..97b8baa72c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java index d580d62aa3..051afc660e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java index e38e76aba0..ded251fc9b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java index c9ead5e4ce..533f21fbae 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java index 85196e59db..665cccfe3a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitHandlerImpl.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataset.DataSet; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java index c3a2cca3ed..8fcbf56250 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelEndpointCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java index 92bb9512f1..41355d7a11 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/SearchOrganisationUnitHandlerImpl.java @@ -30,7 +30,7 @@ import androidx.annotation.NonNull; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.user.User; import org.hisp.dhis.android.core.user.UserOrganisationUnitLink; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java index f89186cd96..5e8bcb86d7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramEndpointCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java index f608e0f45f..6384db4526 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java index 163ad2038b..98e447234e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.legendset.LegendSet; import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java index cf2382fef5..9739f3e699 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleEndpointCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.ObjectWithUid; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java index cfefe990be..d5344c9bca 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java index 8df7a57796..d86b63d56e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java index 42db920b2e..40adc44452 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java index 52a3bfeac0..4b3977886b 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageEndpointCallFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java index e8a5ec193a..a85545409c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java index 6ea54a7727..93930c56ff 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java index 0c74ccb138..8c9d2a6349 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.common.DictionaryTableHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ValueTypeRendering; import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java index 55bf56974d..69f4fdf5dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeEndpointCallFactory.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java index a176a61d1f..b9b23cd8f2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeHandler.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java index 807e438d97..2c92f3bd0a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeHandler.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java index f05a8e34f6..9e88632a42 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueEndpointCallFactory.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java index 9142726f6c..21d7d04edf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java index 135f8b4d21..d797b8b282 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceImportHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.enrollment.EnrollmentImportHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java index 091ea7a691..f3248a7fb9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCallFactory.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java index 574fbed6e3..0b429c86a2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java index dbd9838c12..d4d5a76ea0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityEndpointCallFactory.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java index 44491d3dfe..104cb18426 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCall.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.data.database.Transaction; import org.hisp.dhis.android.core.maintenance.D2Error; import org.hisp.dhis.android.core.resource.Resource; diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java index e8d04ffee4..76db12a245 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserHandler.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import javax.inject.Inject; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java index 7fa3f74597..b50611ac1d 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java index 63b0405f7a..82b4e89922 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java @@ -27,6 +27,7 @@ */ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.data.api.RetrofitFactory; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.data.database.Transaction; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java index c9a7e53675..5adb88a8ea 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetHandlerShould.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java index 7b19dadf4c..c10816ca4f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils; diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java index 35889cc2d6..0a9b9dd5e9 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventHandlerShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.event; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java index 8f8335754a..cbb0d99cf2 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/legendset/LegendSetHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java index 928853d53b..9bcc6ba496 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/option/OptionSetHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java index 4adcd48aab..ea25331279 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCallUnitShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; -import org.hisp.dhis.android.core.common.GenericCallData; +import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.common.Payload; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.api.Fields; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java index f9ee96173b..5293b69f3f 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramHandlerShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.ObjectStyleHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner; import org.hisp.dhis.android.core.trackedentity.TrackedEntityType; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java index 9093befba7..c3385afaf2 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramRuleHandlerShould.java @@ -29,7 +29,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.junit.Before; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java index 258c782821..54da080836 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageHandlerShould.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.common.DataAccess; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyle; import org.hisp.dhis.android.core.common.ObjectStyleHandler; diff --git a/core/src/test/java/org/hisp/dhis/android/core/resource/ResourceHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/resource/ResourceHandlerShould.java index 9f9038963c..aec25c7ca6 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/resource/ResourceHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/resource/ResourceHandlerShould.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.resource; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java index 80a774ac7f..40d52f03cc 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceHandlerShould.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; -import org.hisp.dhis.android.core.common.HandleAction; +import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.common.Transformer; From 32d6d3bd6bb18f46083c1d2d49345b2bf83271c7 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:11:17 +0200 Subject: [PATCH 029/155] Move AggregationTypeColumnAdapter --- .../common/{ => internal}/AggregationTypeColumnAdapter.java | 3 ++- .../hisp/dhis/android/core/program/ProgramIndicatorModel.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/common/{ => internal}/AggregationTypeColumnAdapter.java (94%) diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java b/core/src/main/java/org/hisp/dhis/android/core/common/internal/AggregationTypeColumnAdapter.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java rename to core/src/main/java/org/hisp/dhis/android/core/common/internal/AggregationTypeColumnAdapter.java index 4a25eabacb..838646d614 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/AggregationTypeColumnAdapter.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/AggregationTypeColumnAdapter.java @@ -26,8 +26,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.common.internal; +import org.hisp.dhis.android.core.common.AggregationType; import org.hisp.dhis.android.core.data.database.EnumColumnAdapter; import androidx.annotation.NonNull; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java index 098b635abf..d66fff2c21 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorModel.java @@ -35,7 +35,7 @@ import com.google.auto.value.AutoValue; import org.hisp.dhis.android.core.common.AggregationType; -import org.hisp.dhis.android.core.common.AggregationTypeColumnAdapter; +import org.hisp.dhis.android.core.common.internal.AggregationTypeColumnAdapter; import org.hisp.dhis.android.core.common.BaseNameableObjectModel; import org.hisp.dhis.android.core.utils.Utils; From 892f414b73a89fec39f99b5466ef661ec64f454b Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:12:41 +0200 Subject: [PATCH 030/155] Move CursorModelFactory --- .../core/arch/db/cursors/internal/CursorExecutorImpl.java | 2 -- .../db/cursors/internal}/CursorModelFactory.java | 2 +- .../arch/db/stores/internal/IdentifiableObjectStoreImpl.java | 2 +- .../stores/internal/IdentifiableObjectWithStateStoreImpl.java | 2 +- .../core/arch/db/stores/internal/LinkModelStoreImpl.java | 2 +- .../android/core/arch/db/stores/internal/ObjectStoreImpl.java | 2 +- .../core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java | 2 +- .../dhis/android/core/arch/db/stores/internal/StoreFactory.java | 2 +- .../org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java | 1 + .../hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java | 2 +- .../java/org/hisp/dhis/android/core/event/EventStoreImpl.java | 2 +- .../core/trackedentity/TrackedEntityDataValueStoreImpl.java | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/db/cursors/internal}/CursorModelFactory.java (96%) diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java index 23e0cd70b3..e236d9c07f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorExecutorImpl.java @@ -29,8 +29,6 @@ import android.database.Cursor; -import org.hisp.dhis.android.core.common.CursorModelFactory; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/CursorModelFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorModelFactory.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/common/CursorModelFactory.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorModelFactory.java index 3bd30c7c1f..c5bd60c877 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/CursorModelFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/cursors/internal/CursorModelFactory.java @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.android.core.common; +package org.hisp.dhis.android.core.arch.db.cursors.internal; import android.database.Cursor; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java index c9ee3eea27..529c06405a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java index 2497298ca2..8d597d8c42 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectWithStateStoreImpl.java @@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java index 9acdc2441f..b9e50f4149 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkModelStoreImpl.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java index 0209822c10..f01839a224 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.common.BaseModel; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.SQLOrderType; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java index 87c101ea1b..3dfe7d916f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java index 2af82b35aa..08ca81201a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.java @@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.common.Model; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java index 18b11d0454..2013aec1dc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleStoreImpl.java @@ -28,6 +28,7 @@ package org.hisp.dhis.android.core.common; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java index 5fa8f5d2ee..3fc18fe3bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentStoreImpl.java @@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.arch.helpers.CoordinateHelper; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.arch.db.statementwrapper.internal.SQLStatementWrapper; diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java index 29cb359aef..95cbe2901e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java @@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.common.BaseIdentifiableObjectModel; import org.hisp.dhis.android.core.arch.helpers.CoordinateHelper; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectWithStateStoreImpl; import org.hisp.dhis.android.core.common.State; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java index 0f3cefdb23..c8d3a9b1dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueStoreImpl.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder; import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder; import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection; -import org.hisp.dhis.android.core.common.CursorModelFactory; +import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorModelFactory; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl; import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; From cfe728942d253eefa32d87856e6da790b45e8ed4 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:14:03 +0200 Subject: [PATCH 031/155] Remove deletableStore --- .../arch/db/stores/internal/ObjectStore.java | 5 +-- .../android/core/common/DeletableStore.java | 33 ------------------- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/DeletableStore.java diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java index 20df7bc40e..65378682a1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStore.java @@ -28,14 +28,13 @@ package org.hisp.dhis.android.core.arch.db.stores.internal; -import org.hisp.dhis.android.core.common.DeletableStore; import org.hisp.dhis.android.core.common.SQLOrderType; import java.util.List; import androidx.annotation.NonNull; -public interface ObjectStore extends DeletableStore { +public interface ObjectStore { long insert(@NonNull M m) throws RuntimeException; @@ -57,6 +56,8 @@ public interface ObjectStore extends DeletableStore { List selectStringColumnsWhereClause(String column, String clause) throws RuntimeException; + int delete(); + boolean deleteById(@NonNull M m); boolean deleteWhere(String whereClause); diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/DeletableStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/DeletableStore.java deleted file mode 100644 index 1cc3ca291b..0000000000 --- a/core/src/main/java/org/hisp/dhis/android/core/common/DeletableStore.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2004-2019, 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.common; - -public interface DeletableStore { - int delete(); -} From e119f29dc8bfd3bee53bafb9c7cbc5567e33a358 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:16:12 +0200 Subject: [PATCH 032/155] Move OrderedLinkSyncHandler --- .../internal}/OrderedLinkSyncHandler.java | 5 +- .../internal}/OrderedLinkSyncHandlerImpl.java | 4 +- .../CategoryCategoryComboEntityDIModule.java | 4 +- .../CategoryCategoryOptionEntityDIModule.java | 4 +- .../core/category/CategoryComboHandler.java | 2 +- .../core/category/CategoryHandler.java | 2 +- .../android/core/common/LinkModelHandler.java | 34 ------------- .../core/common/LinkModelHandlerImpl.java | 51 ------------------- .../SectionDataElementEntityDIModule.java | 4 +- .../android/core/dataset/SectionHandler.java | 2 +- ...StageSectionDataElementEntityDIModule.java | 4 +- .../program/ProgramStageSectionHandler.java | 2 +- ...ckedEntityTypeAttributeEntityDIModule.java | 4 +- .../TrackedEntityTypeHandler.java | 2 +- .../category/CategoryComboHandlerShould.java | 2 +- .../core/category/CategoryHandlerShould.java | 2 +- .../core/dataset/SectionHandlerShould.java | 2 +- .../ProgramStageSectionHandlerShould.java | 2 +- 18 files changed, 26 insertions(+), 106 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/handlers/internal}/OrderedLinkSyncHandler.java (91%) rename core/src/main/java/org/hisp/dhis/android/core/{common => arch/handlers/internal}/OrderedLinkSyncHandlerImpl.java (92%) delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandler.java delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandler.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandler.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandler.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandler.java index 6cf024b63c..7620b23be9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandler.java @@ -25,7 +25,10 @@ * (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.common; +package org.hisp.dhis.android.core.arch.handlers.internal; + +import org.hisp.dhis.android.core.common.Model; +import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandlerImpl.java similarity index 92% rename from core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandlerImpl.java index f9a919f7e9..3d080b5a2d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/OrderedLinkSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandlerImpl.java @@ -25,9 +25,11 @@ * (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.common; +package org.hisp.dhis.android.core.arch.handlers.internal; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; +import org.hisp.dhis.android.core.common.Model; +import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java index ec7e5f99b9..a2b1ec6610 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java index 3d04ced978..93c66448ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java index c7fabcbce8..2d51684415 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java index 7d9ee5338c..0325d8aa83 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java @@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandler.java b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandler.java deleted file mode 100644 index 228b7c41dd..0000000000 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandler.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2004-2019, 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.common; - -import java.util.Collection; - -public interface LinkModelHandler { - void handleMany(String masterUid, Collection slaveCollection, Transformer transformer); -} diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java deleted file mode 100644 index 4813336016..0000000000 --- a/core/src/main/java/org/hisp/dhis/android/core/common/LinkModelHandlerImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004-2019, 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.common; - -import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; - -import java.util.Collection; - -public final class LinkModelHandlerImpl implements LinkModelHandler { - - private final LinkModelStore store; - - public LinkModelHandlerImpl(LinkModelStore store) { - this.store = store; - } - - @Override - public void handleMany(String masterUid, Collection slaves, Transformer transformer) { - store.deleteLinksForMasterUid(masterUid); - if (slaves != null) { - for (S slave : slaves) { - store.insert(transformer.transform(slave)); - } - } - } -} diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java index 0fd0065926..79c6cf0e12 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java index 4680621743..b3aea21206 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.dataelement.DataElement; import org.hisp.dhis.android.core.dataelement.DataElementOperand; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java index 215dedf1a1..beed68f624 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionDataElementEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.program; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java index 93930c56ff..df3338c019 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandler.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.dataelement.DataElement; import javax.inject.Inject; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java index 3b4e1bd523..24fa90b416 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeEntityDIModule.java @@ -30,8 +30,8 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import java.util.Collections; diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java index 0b429c86a2..28bb5241dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeHandler.java @@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import javax.inject.Inject; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java index b50611ac1d..e79098d592 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryComboHandlerShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.Transformer; diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java index 141ecd3c6b..1183c33702 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryHandlerShould.java @@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.Access; import org.hisp.dhis.android.core.common.DataAccess; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java index a0aaa62a62..9d170b02f9 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/SectionHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.dataelement.DataElement; diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java index 8655a68b7b..e0709f14bd 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageSectionHandlerShould.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.common.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; import org.hisp.dhis.android.core.common.OrderedLinkTransformer; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.dataelement.DataElement; From a4eb3c47176aa8aedddadc639890856cb4972c55 Mon Sep 17 00:00:00 2001 From: Luis Delgado Romera Date: Mon, 3 Jun 2019 15:20:06 +0200 Subject: [PATCH 033/155] Remove Sync word from all handlers (temporary in 1.0 migration) --- ...ectionRepositoryImplIntegrationShould.java | 4 +- ...ectionRepositoryImplIntegrationShould.java | 4 +- ...alueEndpointCallRealIntegrationShould.java | 6 +-- ...rvedValueManagerRealIntegrationShould.java | 6 +-- .../hisp/dhis/android/core/D2DIComponent.java | 4 +- ...nsactionalNoResourceSyncCallProcessor.java | 6 +-- ...ransactionalResourceSyncCallProcessor.java | 6 +-- .../internal/IdentifiableEntityDIModule.java | 4 +- .../ObjectWithoutUidEntityDIModule.java | 4 +- .../{SyncHandler.java => Handler.java} | 2 +- ...dlerBaseImpl.java => HandlerBaseImpl.java} | 2 +- ...ormer.java => HandlerWithTransformer.java} | 2 +- ....java => IdentifiableDataHandlerImpl.java} | 6 +-- ...Impl.java => IdentifiableHandlerImpl.java} | 6 +-- ...{LinkSyncHandler.java => LinkHandler.java} | 2 +- ...cHandlerImpl.java => LinkHandlerImpl.java} | 4 +- ....java => ObjectWithoutUidHandlerImpl.java} | 4 +- ...ncHandler.java => OrderedLinkHandler.java} | 2 +- ...rImpl.java => OrderedLinkHandlerImpl.java} | 4 +- .../CategoryCategoryComboEntityDIModule.java | 8 ++-- .../CategoryCategoryOptionEntityDIModule.java | 8 ++-- .../CategoryComboEndpointCallFactory.java | 6 +-- .../category/CategoryComboEntityDIModule.java | 4 +- .../core/category/CategoryComboHandler.java | 16 +++---- .../category/CategoryEndpointCallFactory.java | 6 +-- .../core/category/CategoryEntityDIModule.java | 4 +- .../core/category/CategoryHandler.java | 16 +++---- ...tionComboCategoryOptionEntityDIModule.java | 8 ++-- .../CategoryOptionComboEntityDIModule.java | 4 +- .../category/CategoryOptionComboHandler.java | 10 ++--- .../CategoryOptionEntityDIModule.java | 8 ++-- .../core/common/ObjectStyleHandler.java | 4 +- .../core/common/ObjectStyleHandlerImpl.java | 4 +- ...alueTypeDeviceRenderingEntityDIModule.java | 8 ++-- .../common/ValueTypeRenderingHandler.java | 6 +-- .../core/constant/ConstantCallFactory.java | 6 +-- .../core/constant/ConstantHandler.java | 4 +- .../constant/ConstantPackageDIModule.java | 4 +- .../dataapproval/DataApprovalCallFactory.java | 6 +-- .../DataApprovalEntityDIModule.java | 8 ++-- .../DataElementEndpointCallFactory.java | 6 +-- .../DataElementEntityDIModule.java | 4 +- .../core/dataelement/DataElementHandler.java | 4 +- .../DataElementOperandEntityDIModule.java | 8 ++-- .../DataInputPeriodEntityDIModule.java | 8 ++-- ...ataSetCompleteRegistrationCallFactory.java | 6 +-- ...pleteRegistrationCollectionRepository.java | 6 +-- ...SetCompleteRegistrationEntityDIModule.java | 8 ++-- ...lsoryDataElementOperandEntityDIModule.java | 8 ++-- .../dataset/DataSetElementEntityDIModule.java | 8 ++-- .../dataset/DataSetEndpointCallFactory.java | 6 +-- .../core/dataset/DataSetEntityDIModule.java | 4 +- .../android/core/dataset/DataSetHandler.java | 32 +++++++------- .../SectionDataElementEntityDIModule.java | 8 ++-- .../core/dataset/SectionEntityDIModule.java | 4 +- .../SectionGreyedFieldsEntityDIModule.java | 8 ++-- .../android/core/dataset/SectionHandler.java | 22 +++++----- .../DataValueEndpointCallFactory.java | 6 +-- .../datavalue/DataValueEntityDIModule.java | 8 ++-- .../enrollment/EnrollmentEntityDIModule.java | 4 +- .../core/enrollment/EnrollmentHandler.java | 16 +++---- .../enrollment/note/NoteEntityDIModule.java | 8 ++-- .../core/event/EventEntityDIModule.java | 4 +- .../dhis/android/core/event/EventHandler.java | 10 ++--- .../event/EventPersistenceCallFactory.java | 6 +-- .../DataSetIndicatorEntityDIModule.java | 8 ++-- .../IndicatorEndpointCallFactory.java | 6 +-- .../indicator/IndicatorEntityDIModule.java | 8 ++-- .../IndicatorTypeEndpointCallFactory.java | 6 +-- .../IndicatorTypeEntityDIModule.java | 8 ++-- .../core/legendset/LegendEntityDIModule.java | 8 ++-- .../legendset/LegendSetEntityDIModule.java | 4 +- .../core/legendset/LegendSetHandler.java | 10 ++--- .../core/option/OptionEntityDIModule.java | 4 +- .../core/option/OptionGroupCallFactory.java | 6 +-- .../option/OptionGroupEntityDIModule.java | 4 +- .../core/option/OptionGroupHandler.java | 10 ++--- .../OptionGroupOptionEntityDIModule.java | 8 ++-- .../android/core/option/OptionHandler.java | 4 +- .../core/option/OptionSetCallFactory.java | 6 +-- .../core/option/OptionSetEntityDIModule.java | 4 +- .../android/core/option/OptionSetHandler.java | 10 ++--- .../OrganisationUnitGroupEntityDIModule.java | 8 ++-- .../OrganisationUnitHandler.java | 4 +- .../OrganisationUnitHandlerImpl.java | 42 +++++++++---------- ...anisationUnitLevelEndpointCallFactory.java | 6 +-- .../OrganisationUnitLevelEntityDIModule.java | 8 ++-- .../SearchOrganisationUnitHandler.java | 4 +- .../SearchOrganisationUnitHandlerImpl.java | 4 +- .../program/ProgramEndpointCallFactory.java | 6 +-- .../core/program/ProgramEntityDIModule.java | 4 +- .../android/core/program/ProgramHandler.java | 26 ++++++------ .../ProgramIndicatorEntityDIModule.java | 4 +- .../core/program/ProgramIndicatorHandler.java | 16 +++---- ...ogramIndicatorLegendSetEntityDIModule.java | 8 ++-- .../ProgramRuleActionEntityDIModule.java | 8 ++-- .../ProgramRuleEndpointCallFactory.java | 6 +-- .../program/ProgramRuleEntityDIModule.java | 4 +- .../core/program/ProgramRuleHandler.java | 10 ++--- .../ProgramRuleVariableEntityDIModule.java | 8 ++-- ...ProgramSectionAttributeEntityDIModule.java | 8 ++-- .../program/ProgramSectionEntityDIModule.java | 4 +- .../core/program/ProgramSectionHandler.java | 10 ++--- ...ProgramStageDataElementEntityDIModule.java | 4 +- .../ProgramStageDataElementHandler.java | 10 ++--- .../ProgramStageEndpointCallFactory.java | 6 +-- .../program/ProgramStageEntityDIModule.java | 4 +- .../core/program/ProgramStageHandler.java | 16 +++---- ...StageSectionDataElementEntityDIModule.java | 8 ++-- .../ProgramStageSectionEntityDIModule.java | 4 +- .../program/ProgramStageSectionHandler.java | 22 +++++----- ...SectionProgramIndicatorEntityDIModule.java | 8 ++-- ...mTrackedEntityAttributeEntityDIModule.java | 4 +- .../ProgramTrackedEntityAttributeHandler.java | 10 ++--- .../RelationshipConstraintEntityDIModule.java | 8 ++-- .../relationship/RelationshipHandler.java | 4 +- .../relationship/RelationshipHandlerImpl.java | 6 +-- .../RelationshipItemEntityDIModule.java | 8 ++-- .../RelationshipTypeEndpointCallFactory.java | 6 +-- .../RelationshipTypeEntityDIModule.java | 4 +- .../relationship/RelationshipTypeHandler.java | 10 ++--- .../core/settings/SystemSettingCall.java | 6 +-- .../settings/SystemSettingEntityDIModule.java | 8 ++-- .../core/systeminfo/SystemInfoCall.java | 6 +-- .../systeminfo/SystemInfoEntityDIModule.java | 8 ++-- .../TrackedEntityAttributeEntityDIModule.java | 4 +- .../TrackedEntityAttributeHandler.java | 4 +- ...tyAttributeReservedValueCallProcessor.java | 6 +-- ...ibuteReservedValueEndpointCallFactory.java | 6 +-- ...yAttributeReservedValueEntityDIModule.java | 8 ++-- ...kedEntityAttributeValueEntityDIModule.java | 4 +- .../TrackedEntityAttributeValueHandler.java | 8 ++-- .../TrackedEntityDataValueEntityDIModule.java | 4 +- .../TrackedEntityDataValueHandler.java | 4 +- .../TrackedEntityInstanceHandler.java | 14 +++---- ...ckedEntityTypeAttributeEntityDIModule.java | 8 ++-- .../TrackedEntityTypeCallFactory.java | 6 +-- .../TrackedEntityTypeEntityDIModule.java | 4 +- .../TrackedEntityTypeHandler.java | 10 ++--- .../core/user/AuthorityCallProcessor.java | 6 +-- .../user/AuthorityEndpointCallFactory.java | 6 +-- .../core/user/AuthorityEntityDIModule.java | 8 ++-- .../user/UserAuthenticateCallFactory.java | 6 +-- .../hisp/dhis/android/core/user/UserCall.java | 6 +-- .../user/UserCredentialsEntityDIModule.java | 8 ++-- .../android/core/user/UserEntityDIModule.java | 4 +- .../dhis/android/core/user/UserHandler.java | 14 +++---- ...serOrganisationUnitLinkEntityDIModule.java | 8 ++-- .../core/user/UserRoleEntityDIModule.java | 8 ++-- .../category/CategoryComboHandlerShould.java | 12 +++--- .../core/category/CategoryHandlerShould.java | 10 ++--- .../ValueTypeRenderingHandlerShould.java | 4 +- .../dataelement/DataElementHandlerShould.java | 4 +- .../core/dataset/DataSetHandlerShould.java | 16 +++---- .../core/dataset/SectionHandlerShould.java | 12 +++--- .../enrollment/EnrollmentHandlerShould.java | 8 ++-- .../core/event/EventHandlerShould.java | 4 +- .../legendset/LegendSetHandlerShould.java | 8 ++-- .../core/option/OptionSetHandlerShould.java | 8 ++-- .../OrganisationUnitHandlerShould.java | 14 +++---- .../program/ProgramEndpointCallShould.java | 4 +- .../core/program/ProgramHandlerShould.java | 12 +++--- .../ProgramIndicatorHandlerShould.java | 10 ++--- .../program/ProgramRuleHandlerShould.java | 10 ++--- .../program/ProgramSectionHandlerShould.java | 8 ++-- .../ProgramStageDataElementHandlerShould.java | 8 ++-- .../program/ProgramStageHandlerShould.java | 8 ++-- .../ProgramStageSectionHandlerShould.java | 12 +++--- ...amTrackedEntityAttributeHandlerShould.java | 10 ++--- .../RelationshipHandlerShould.java | 4 +- .../core/systeminfo/SystemInfoCallShould.java | 4 +- .../TrackedEntityAttributeHandlerShould.java | 4 +- .../TrackedEntityInstanceHandlerShould.java | 6 +-- .../user/AuthorityEndpointCallShould.java | 4 +- .../user/UserAuthenticateCallUnitShould.java | 4 +- .../android/core/user/UserCallShould.java | 4 +- .../android/core/user/UserHandlerShould.java | 10 ++--- 177 files changed, 653 insertions(+), 653 deletions(-) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{SyncHandler.java => Handler.java} (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{SyncHandlerBaseImpl.java => HandlerBaseImpl.java} (98%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{SyncHandlerWithTransformer.java => HandlerWithTransformer.java} (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{IdentifiableDataSyncHandlerImpl.java => IdentifiableDataHandlerImpl.java} (94%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{IdentifiableSyncHandlerImpl.java => IdentifiableHandlerImpl.java} (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{LinkSyncHandler.java => LinkHandler.java} (97%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{LinkSyncHandlerImpl.java => LinkHandlerImpl.java} (93%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{ObjectWithoutUidSyncHandlerImpl.java => ObjectWithoutUidHandlerImpl.java} (91%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{OrderedLinkSyncHandler.java => OrderedLinkHandler.java} (96%) rename core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/{OrderedLinkSyncHandlerImpl.java => OrderedLinkHandlerImpl.java} (93%) diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java index 8410968c93..5fb0b3a122 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.data.relationship.RelationshipTypeSamples; import org.hisp.dhis.android.core.relationship.RelationshipType; import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository; @@ -59,7 +59,7 @@ public static void setUpClass() throws Exception { typeMap = RelationshipTypeSamples.typeMap(); - SyncHandler handler = objects.d2DIComponent.relationshipTypeHandler(); + Handler handler = objects.d2DIComponent.relationshipTypeHandler(); handler.handle(RELATIONSHIP_TYPE_1); handler.handle(RELATIONSHIP_TYPE_2); diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java index 3a393b7e0c..61bc200a77 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl; import org.hisp.dhis.android.core.relationship.RelationshipType; import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository; @@ -54,7 +54,7 @@ public class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould exten public static void setUpClass() throws Exception { BaseMockIntegrationTestEmptyDispatcher.setUpClass(); - SyncHandler handler = objects.d2DIComponent.relationshipTypeHandler(); + Handler handler = objects.d2DIComponent.relationshipTypeHandler(); handler.handle(RELATIONSHIP_TYPE_1); handler.handle(RELATIONSHIP_TYPE_2); diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java index 652daf7eec..8ef8b6ff61 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallRealIntegrationShould.java @@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.D2; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutorImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; import org.hisp.dhis.android.core.common.D2Factory; import org.hisp.dhis.android.core.utils.integration.real.BaseRealIntegrationTest; import org.junit.Before; @@ -63,7 +63,7 @@ public void setUp() throws IOException { private Callable> createCall() { APICallExecutor apiCallExecutor = APICallExecutorImpl.create(d2.databaseAdapter()); - SyncHandler dataValueHandler = new ObjectWithoutUidSyncHandlerImpl<>( + Handler dataValueHandler = new ObjectWithoutUidHandlerImpl<>( DataValueStore.create(databaseAdapter())); return new DataValueEndpointCallFactory(getGenericCallData(d2), apiCallExecutor, dataValueHandler).create( DataValueQuery.create(getDataSetUids(), getPeriodIds(), getOrgUnitUids())); diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java index 784f3d298a..7d475320aa 100644 --- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java +++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.trackedentity; import org.hisp.dhis.android.core.D2; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory; import org.hisp.dhis.android.core.category.CategoryCombo; import org.hisp.dhis.android.core.category.CategoryComboTableInfo; @@ -111,7 +111,7 @@ public void setUp() throws IOException { manager = d2.trackedEntityModule().reservedValueManager; - SyncHandler handler = new ObjectWithoutUidSyncHandlerImpl<>(store); + Handler handler = new ObjectWithoutUidHandlerImpl<>(store); List trackedEntityAttributeReservedValues = new ArrayList<>(); diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java index 0d433dd05f..91acee45bc 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java +++ b/core/src/main/java/org/hisp/dhis/android/core/D2DIComponent.java @@ -31,7 +31,7 @@ import android.content.Context; import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.di.internal.RepositoriesDIModule; import org.hisp.dhis.android.core.domain.metadata.MetadataCall; import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; @@ -136,7 +136,7 @@ public interface D2DIComponent { @VisibleForTesting UidsCallFactory trackedEntityTypeCallFactory(); @VisibleForTesting - SyncHandler relationshipTypeHandler(); + Handler relationshipTypeHandler(); @VisibleForTesting TrackedEntityInstancePostCall trackedEntityInstancePostCall(); @VisibleForTesting diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java index 007b64985d..359173aa71 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.call.processors.internal; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.maintenance.D2Error; @@ -37,10 +37,10 @@ public class TransactionalNoResourceSyncCallProcessor implements CallProcessor { private final DatabaseAdapter databaseAdapter; - private final SyncHandler handler; + private final Handler handler; public TransactionalNoResourceSyncCallProcessor(DatabaseAdapter databaseAdapter, - SyncHandler handler) { + Handler handler) { this.databaseAdapter = databaseAdapter; this.handler = handler; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java index d1882b2c21..c42be25621 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalResourceSyncCallProcessor.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.arch.call.processors.internal; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.common.D2CallExecutor; import org.hisp.dhis.android.core.arch.call.internal.GenericCallData; import org.hisp.dhis.android.core.maintenance.D2Error; @@ -38,11 +38,11 @@ public class TransactionalResourceSyncCallProcessor implements CallProcessor { private final GenericCallData data; - private final SyncHandler handler; + private final Handler handler; private final Resource.Type resourceType; public TransactionalResourceSyncCallProcessor(GenericCallData data, - SyncHandler handler, + Handler handler, Resource.Type resourceType) { this.data = data; this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java index d6e97a5fda..1993dc41bb 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java @@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.arch.di.internal; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.common.ObjectWithUidInterface; public interface IdentifiableEntityDIModule extends IdentifiableStoreProvider { - SyncHandler handler(IdentifiableObjectStore store); + Handler handler(IdentifiableObjectStore store); } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java index c6d9c29d2e..e7bfb4de03 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.arch.di.internal; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; public interface ObjectWithoutUidEntityDIModule extends ObjectWithoutUidStoreProvider { - SyncHandler handler(ObjectWithoutUidStore store); + Handler handler(ObjectWithoutUidStore store); } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandler.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandler.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.java index 9e0b0dbfcc..9073a731b8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.java @@ -29,7 +29,7 @@ import java.util.Collection; -public interface SyncHandler { +public interface Handler { void handle(O o); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.java similarity index 98% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.java index 65084f5173..fe69c257f1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerBaseImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.java @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.List; -abstract class SyncHandlerBaseImpl implements SyncHandlerWithTransformer { +abstract class HandlerBaseImpl implements HandlerWithTransformer { @Override public final void handle(O o) { diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerWithTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerWithTransformer.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.java index eb6dd92a12..97f3bd06bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/SyncHandlerWithTransformer.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.java @@ -31,7 +31,7 @@ import java.util.Collection; -public interface SyncHandlerWithTransformer extends SyncHandler { +public interface HandlerWithTransformer extends Handler { void handle(O o, Transformer transformer); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.java similarity index 94% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.java index 8d04fc9d93..bf8a3227e7 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.java @@ -44,10 +44,10 @@ import static org.hisp.dhis.android.core.utils.Utils.isDeleted; -public class IdentifiableDataSyncHandlerImpl - extends IdentifiableSyncHandlerImpl { +public class IdentifiableDataHandlerImpl + extends IdentifiableHandlerImpl { - public IdentifiableDataSyncHandlerImpl(IdentifiableObjectStore store) { + public IdentifiableDataHandlerImpl(IdentifiableObjectStore store) { super(store); } diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableHandlerImpl.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableHandlerImpl.java index 329bf1574a..08c3495814 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableHandlerImpl.java @@ -33,12 +33,12 @@ import static org.hisp.dhis.android.core.utils.Utils.isDeleted; -public class IdentifiableSyncHandlerImpl - extends SyncHandlerBaseImpl { +public class IdentifiableHandlerImpl + extends HandlerBaseImpl { final IdentifiableObjectStore store; - public IdentifiableSyncHandlerImpl(IdentifiableObjectStore store) { + public IdentifiableHandlerImpl(IdentifiableObjectStore store) { this.store = store; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandler.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.java similarity index 97% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandler.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.java index 90d3e0e13b..9403fbd46e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.java @@ -32,6 +32,6 @@ import java.util.Collection; -public interface LinkSyncHandler { +public interface LinkHandler { void handleMany(String masterUid, Collection slaves, Transformer transformer); } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandlerImpl.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandlerImpl.java index 10fcf54734..e8a9acac8d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandlerImpl.java @@ -33,11 +33,11 @@ import java.util.Collection; -public class LinkSyncHandlerImpl implements LinkSyncHandler { +public class LinkHandlerImpl implements LinkHandler { private final LinkModelStore store; - public LinkSyncHandlerImpl(LinkModelStore store) { + public LinkHandlerImpl(LinkModelStore store) { this.store = store; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidHandlerImpl.java similarity index 91% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidHandlerImpl.java index bd57409a91..a600252de2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/ObjectWithoutUidHandlerImpl.java @@ -30,11 +30,11 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.Model; -public class ObjectWithoutUidSyncHandlerImpl extends SyncHandlerBaseImpl { +public class ObjectWithoutUidHandlerImpl extends HandlerBaseImpl { private final ObjectWithoutUidStore store; - public ObjectWithoutUidSyncHandlerImpl(ObjectWithoutUidStore store) { + public ObjectWithoutUidHandlerImpl(ObjectWithoutUidStore store) { this.store = store; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandler.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandler.java similarity index 96% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandler.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandler.java index 7620b23be9..48b020382c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandler.java @@ -32,6 +32,6 @@ import java.util.List; -public interface OrderedLinkSyncHandler { +public interface OrderedLinkHandler { void handleMany(String masterUid, List slaveCollection, OrderedLinkTransformer transformer); } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.java similarity index 93% rename from core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandlerImpl.java rename to core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.java index 3d080b5a2d..4030516c7e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkSyncHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.java @@ -33,11 +33,11 @@ import java.util.List; -public class OrderedLinkSyncHandlerImpl implements OrderedLinkSyncHandler { +public class OrderedLinkHandlerImpl implements OrderedLinkHandler { private final LinkModelStore store; - public OrderedLinkSyncHandlerImpl(LinkModelStore store) { + public OrderedLinkHandlerImpl(LinkModelStore store) { this.store = store; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java index a2b1ec6610..661c8d3b99 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryComboEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; @@ -48,8 +48,8 @@ LinkModelStore store(DatabaseAdapter databaseAdapter) @Provides @Reusable - OrderedLinkSyncHandler handler( + OrderedLinkHandler handler( LinkModelStore store) { - return new OrderedLinkSyncHandlerImpl<>(store); + return new OrderedLinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java index 93c66448ba..7e78f2c525 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCategoryOptionEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; @@ -48,8 +48,8 @@ LinkModelStore store(DatabaseAdapter databaseAdapter @Provides @Reusable - OrderedLinkSyncHandler handler( + OrderedLinkHandler handler( LinkModelStore store) { - return new OrderedLinkSyncHandlerImpl<>(store); + return new OrderedLinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java index 959b20f0b2..5fedbde877 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEndpointCallFactory.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; @@ -52,13 +52,13 @@ final class CategoryComboEndpointCallFactory extends UidsCallFactoryImpl handler; + private final Handler handler; @Inject CategoryComboEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, CategoryComboService service, - SyncHandler handler) { + Handler handler) { super(data, apiCallExecutor); this.service = service; this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java index 270c30edc7..ebba8939c9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; @@ -55,7 +55,7 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAdap @Provides @Reusable - public SyncHandler handler(CategoryComboHandler impl) { + public Handler handler(CategoryComboHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java index 2d51684415..929a137208 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboHandler.java @@ -30,11 +30,11 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import javax.inject.Inject; @@ -42,17 +42,17 @@ import dagger.Reusable; @Reusable -final class CategoryComboHandler extends IdentifiableSyncHandlerImpl { +final class CategoryComboHandler extends IdentifiableHandlerImpl { - private final SyncHandlerWithTransformer optionComboHandler; - private final OrderedLinkSyncHandler categoryCategoryComboLinkHandler; + private final HandlerWithTransformer optionComboHandler; + private final OrderedLinkHandler categoryCategoryComboLinkHandler; private final OrphanCleaner categoryOptionCleaner; @Inject CategoryComboHandler( @NonNull IdentifiableObjectStore store, - @NonNull SyncHandlerWithTransformer optionComboHandler, - @NonNull OrderedLinkSyncHandler categoryCategoryComboLinkHandler, + @NonNull HandlerWithTransformer optionComboHandler, + @NonNull OrderedLinkHandler categoryCategoryComboLinkHandler, OrphanCleaner categoryOptionCleaner) { super(store); this.optionComboHandler = optionComboHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java index 106857d60e..a9bb03ff98 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEndpointCallFactory.java @@ -30,7 +30,7 @@ import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; @@ -51,13 +51,13 @@ final class CategoryEndpointCallFactory extends UidsCallFactoryImpl { private static final int MAX_UID_LIST_SIZE = 90; - private final SyncHandler handler; + private final Handler handler; private final CategoryService service; @Inject CategoryEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, - SyncHandler handler, + Handler handler, CategoryService service) { super(data, apiCallExecutor); this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java index d9789d671b..28f38e2a2a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryEntityDIModule.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -53,7 +53,7 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) @Provides @Reusable - public SyncHandler handler(CategoryHandler impl) { + public Handler handler(CategoryHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java index 0325d8aa83..317564aa01 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryHandler.java @@ -30,11 +30,11 @@ import androidx.annotation.NonNull; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler; import java.util.ArrayList; import java.util.List; @@ -44,16 +44,16 @@ import dagger.Reusable; @Reusable -final class CategoryHandler extends IdentifiableSyncHandlerImpl { +final class CategoryHandler extends IdentifiableHandlerImpl { - private final SyncHandler categoryOptionHandler; - private final OrderedLinkSyncHandler categoryCategoryOptionLinkHandler; + private final Handler categoryOptionHandler; + private final OrderedLinkHandler categoryCategoryOptionLinkHandler; @Inject CategoryHandler( @NonNull IdentifiableObjectStore categoryStore, - @NonNull SyncHandler categoryOptionHandler, - @NonNull OrderedLinkSyncHandler + @NonNull Handler categoryOptionHandler, + @NonNull OrderedLinkHandler categoryCategoryOptionLinkHandler) { super(categoryStore); this.categoryOptionHandler = categoryOptionHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java index aeb0d9b7c2..95a1bdfa03 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCategoryOptionEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,8 +48,8 @@ LinkModelStore store(DatabaseAdapter data @Provides @Reusable - LinkSyncHandler + LinkHandler categoryOptionComboCategoryOptionLinkHandler(LinkModelStore store) { - return new LinkSyncHandlerImpl<>(store); + return new LinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java index bf43a547fe..3857cecd77 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -50,7 +50,7 @@ public CategoryOptionComboStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - public SyncHandlerWithTransformer handler(CategoryOptionComboHandler impl) { + public HandlerWithTransformer handler(CategoryOptionComboHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java index 568e9f2352..f912257173 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboHandler.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import javax.inject.Inject; @@ -38,14 +38,14 @@ import dagger.Reusable; @Reusable -final class CategoryOptionComboHandler extends IdentifiableSyncHandlerImpl { +final class CategoryOptionComboHandler extends IdentifiableHandlerImpl { - private final LinkSyncHandler + private final LinkHandler categoryOptionComboCategoryOptionLinkHandler; @Inject CategoryOptionComboHandler(CategoryOptionComboStore store, - LinkSyncHandler + LinkHandler categoryOptionComboCategoryOptionLinkHandler) { super(store); this.categoryOptionComboCategoryOptionLinkHandler = categoryOptionComboCategoryOptionLinkHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java index 7f35b19a9a..fdd298a71a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.category; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -55,8 +55,8 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAda @Override @Provides @Reusable - public SyncHandler handler(IdentifiableObjectStore store) { - return new IdentifiableSyncHandlerImpl<>(store); + public Handler handler(IdentifiableObjectStore store) { + return new IdentifiableHandlerImpl<>(store); } @Provides diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java index d45d040cbc..0d079c461a 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandler.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; -public interface ObjectStyleHandler extends SyncHandlerWithTransformer { +public interface ObjectStyleHandler extends HandlerWithTransformer { void handle(ObjectStyle objectStyle, String uid, String objectTable); } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java index e0e00ce759..594ee9703d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ObjectStyleHandlerImpl.java @@ -30,9 +30,9 @@ import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; -public class ObjectStyleHandlerImpl extends ObjectWithoutUidSyncHandlerImpl implements ObjectStyleHandler { +public class ObjectStyleHandlerImpl extends ObjectWithoutUidHandlerImpl implements ObjectStyleHandler { private final ObjectWithoutUidStore store; diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java index 6ef2ba7039..551ca47069 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.common; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import dagger.Module; @@ -48,8 +48,8 @@ ObjectWithoutUidStore store(DatabaseAdapter databaseAd @Provides @Reusable - SyncHandlerWithTransformer handler( + HandlerWithTransformer handler( ObjectWithoutUidStore store) { - return new ObjectWithoutUidSyncHandlerImpl<>(store); + return new ObjectWithoutUidHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java index 2dc7275a58..c66aef8925 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueTypeRenderingHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.common; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; import javax.inject.Inject; @@ -36,10 +36,10 @@ @Reusable final class ValueTypeRenderingHandler implements DictionaryTableHandler { - private final SyncHandlerWithTransformer valueTypeDeviceRenderingHandler; + private final HandlerWithTransformer valueTypeDeviceRenderingHandler; @Inject - ValueTypeRenderingHandler(SyncHandlerWithTransformer valueTypeDeviceRenderingHandler) { + ValueTypeRenderingHandler(HandlerWithTransformer valueTypeDeviceRenderingHandler) { this.valueTypeDeviceRenderingHandler = valueTypeDeviceRenderingHandler; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java index 89d6ff2e19..7abb6b2c5e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.constant; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher; @@ -46,13 +46,13 @@ final class ConstantCallFactory extends ListCallFactoryImpl { private final ConstantService service; - private final SyncHandler handler; + private final Handler handler; @Inject ConstantCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, ConstantService service, - SyncHandler handler) { + Handler handler) { super(data, apiCallExecutor); this.service = service; this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java index ec3eefe351..20bf73233c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantHandler.java @@ -27,7 +27,7 @@ */ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; @@ -38,7 +38,7 @@ import dagger.Reusable; @Reusable -final class ConstantHandler extends IdentifiableSyncHandlerImpl { +final class ConstantHandler extends IdentifiableHandlerImpl { private final CollectionCleaner collectionCleaner; diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java index b5120e935c..dc50540af0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantPackageDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.constant; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; @@ -55,7 +55,7 @@ IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - SyncHandler handler(ConstantHandler impl) { + Handler handler(ConstantHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java index 70b8c311a0..898adb9143 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataapproval; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceCallFetcher; @@ -51,7 +51,7 @@ final class DataApprovalCallFactory extends QueryCallFactoryImpl { - private final SyncHandler handler; + private final Handler handler; private final DataApprovalService service; private final SimpleDateFormat simpleDateFormat = @@ -60,7 +60,7 @@ final class DataApprovalCallFactory extends QueryCallFactoryImpl handler, + Handler handler, DataApprovalService service) { super(genericCallData, apiCallExecutor); this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java index 47cf894c42..3717e04291 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataapproval; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -50,8 +50,8 @@ public ObjectWithoutUidStore store(DatabaseAdapter databaseAdapter @Provides @Reusable - public SyncHandler handler(ObjectWithoutUidStore dataApprovalStore) { - return new ObjectWithoutUidSyncHandlerImpl<>(dataApprovalStore); + public Handler handler(ObjectWithoutUidStore dataApprovalStore) { + return new ObjectWithoutUidHandlerImpl<>(dataApprovalStore); } } diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java index 6683a91f48..f4fe7236c5 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataelement; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; @@ -52,13 +52,13 @@ final class DataElementEndpointCallFactory extends UidsCallFactoryImpl handler; + private final Handler handler; @Inject DataElementEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, DataElementService service, - SyncHandler handler) { + Handler handler) { super(data, apiCallExecutor); this.service = service; this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java index 2ed826a66c..32ff6a3bd9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; @@ -53,7 +53,7 @@ IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - SyncHandler handler(DataElementHandler impl) { + Handler handler(DataElementHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java index cf29115453..5a3a819e58 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementHandler.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleHandler; @@ -38,7 +38,7 @@ import dagger.Reusable; @Reusable -final class DataElementHandler extends IdentifiableSyncHandlerImpl { +final class DataElementHandler extends IdentifiableHandlerImpl { private final ObjectStyleHandler styleHandler; @Inject diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java index 3d388e5619..186287ffe6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementOperandEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataelement; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,7 +48,7 @@ IdentifiableObjectStore store(DatabaseAdapter databaseAdapte @Provides @Reusable - SyncHandler handler(IdentifiableObjectStore store) { - return new IdentifiableSyncHandlerImpl<>(store); + Handler handler(IdentifiableObjectStore store) { + return new IdentifiableHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java index 1914d34c7b..777f7ceaf1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataInputPeriodEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,7 +48,7 @@ LinkModelStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - LinkSyncHandler handler(LinkModelStore store) { - return new LinkSyncHandlerImpl<>(store); + LinkHandler handler(LinkModelStore store) { + return new LinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java index 66ca52678b..cc2e390575 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor; @@ -47,13 +47,13 @@ final class DataSetCompleteRegistrationCallFactory extends QueryCallFactoryImpl { - private final SyncHandler handler; + private final Handler handler; private final DataSetCompleteRegistrationService service; @Inject DataSetCompleteRegistrationCallFactory(GenericCallData genericCallData, APICallExecutor apiCallExecutor, - SyncHandler handler, + Handler handler, DataSetCompleteRegistrationService service) { super(genericCallData, apiCallExecutor); this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java index de3a5c089b..9f632ad7c1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository; import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteCollectionRepository; @@ -54,7 +54,7 @@ public final class DataSetCompleteRegistrationCollectionRepository implements ReadWriteCollectionRepository, ReadOnlyWithUploadCollectionRepository { - private final SyncHandler handler; + private final Handler handler; private final DataSetCompleteRegistrationPostCall postCall; @Inject @@ -62,7 +62,7 @@ public final class DataSetCompleteRegistrationCollectionRepository final DataSetCompleteRegistrationStore store, final Map> childrenAppenders, final RepositoryScope scope, - final SyncHandler handler, + final Handler handler, final DataSetCompleteRegistrationPostCall postCall) { super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope, s -> new DataSetCompleteRegistrationCollectionRepository(store, childrenAppenders, diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java index e5cb6b5e82..04702e6ab0 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -54,8 +54,8 @@ public DataSetCompleteRegistrationStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - public SyncHandler handler(DataSetCompleteRegistrationStore store) { - return new ObjectWithoutUidSyncHandlerImpl<>(store); + public Handler handler(DataSetCompleteRegistrationStore store) { + return new ObjectWithoutUidHandlerImpl<>(store); } @Provides diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java index 7a1ead57dd..250bf899a8 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompulsoryDataElementOperandEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; @@ -49,8 +49,8 @@ LinkModelStore store(DatabaseAdapter da @Provides @Reusable - LinkSyncHandler handler( + LinkHandler handler( LinkModelStore store) { - return new LinkSyncHandlerImpl<>(store); + return new LinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java index 447fb52e18..ba0216742e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetElementEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,7 +48,7 @@ LinkModelStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - LinkSyncHandler handler(LinkModelStore store) { - return new LinkSyncHandlerImpl<>(store); + LinkHandler handler(LinkModelStore store) { + return new LinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java index f10f393534..4ccc243a2d 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; @@ -49,14 +49,14 @@ final class DataSetEndpointCallFactory extends ListCallFactoryImpl { private final DataSetService dataSetService; - private final SyncHandler dataSetHandler; + private final Handler dataSetHandler; private final Resource.Type resourceType = Resource.Type.DATA_SET; @Inject DataSetEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, DataSetService dataSetService, - SyncHandler dataSetHandler) { + Handler dataSetHandler) { super(data, apiCallExecutor); this.dataSetService = dataSetService; this.dataSetHandler = dataSetHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java index 5ed34a5e6e..4224087858 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl; @@ -58,7 +58,7 @@ IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - SyncHandler handler(DataSetHandler impl) { + Handler handler(DataSetHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java index 85053591d6..907ebfc966 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetHandler.java @@ -27,9 +27,9 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; @@ -47,33 +47,33 @@ import dagger.Reusable; @Reusable -final class DataSetHandler extends IdentifiableSyncHandlerImpl { +final class DataSetHandler extends IdentifiableHandlerImpl { private final ObjectStyleHandler styleHandler; - private final SyncHandler

sectionHandler; + private final Handler
sectionHandler; private final OrphanCleaner sectionOrphanCleaner; - private final SyncHandler compulsoryDataElementOperandHandler; - private final LinkSyncHandler + private final Handler compulsoryDataElementOperandHandler; + private final LinkHandler dataSetCompulsoryDataElementOperandLinkHandler; - private final LinkSyncHandler dataInputPeriodHandler; - private final LinkSyncHandler dataSetElementLinkHandler; - private final LinkSyncHandler dataSetIndicatorLinkHandler; + private final LinkHandler dataInputPeriodHandler; + private final LinkHandler dataSetElementLinkHandler; + private final LinkHandler dataSetIndicatorLinkHandler; private final CollectionCleaner collectionCleaner; @Inject DataSetHandler(IdentifiableObjectStore dataSetStore, ObjectStyleHandler styleHandler, - SyncHandler
sectionHandler, + Handler
sectionHandler, OrphanCleaner sectionOrphanCleaner, - SyncHandler compulsoryDataElementOperandHandler, - LinkSyncHandler + Handler compulsoryDataElementOperandHandler, + LinkHandler dataSetCompulsoryDataElementOperandLinkHandler, - LinkSyncHandler dataInputPeriodHandler, - LinkSyncHandler dataSetElementLinkHandler, - LinkSyncHandler dataSetIndicatorLinkHandler, + LinkHandler dataInputPeriodHandler, + LinkHandler dataSetElementLinkHandler, + LinkHandler dataSetIndicatorLinkHandler, CollectionCleaner collectionCleaner) { super(dataSetStore); diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java index 79c6cf0e12..97321d3e2e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionDataElementEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.dataset; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElement; @@ -49,7 +49,7 @@ LinkModelStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - OrderedLinkSyncHandler handler(LinkModelStore store) { - return new OrderedLinkSyncHandlerImpl<>(store); + OrderedLinkHandler handler(LinkModelStore store) { + return new OrderedLinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java index c339fa6222..a345d1a7e2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -51,7 +51,7 @@ IdentifiableObjectStore
store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - SyncHandler
handler(SectionHandler impl) { + Handler
handler(SectionHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java index c39159366e..796e6a7e48 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionGreyedFieldsEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; import org.hisp.dhis.android.core.dataelement.DataElementOperand; @@ -49,8 +49,8 @@ LinkModelStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - LinkSyncHandler handler( + LinkHandler handler( LinkModelStore store) { - return new LinkSyncHandlerImpl<>(store); + return new LinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java index b3aea21206..f03536570c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionHandler.java @@ -27,12 +27,12 @@ */ package org.hisp.dhis.android.core.dataset; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; -import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkSyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler; import org.hisp.dhis.android.core.dataelement.DataElement; import org.hisp.dhis.android.core.dataelement.DataElementOperand; @@ -41,17 +41,17 @@ import dagger.Reusable; @Reusable -final class SectionHandler extends IdentifiableSyncHandlerImpl
{ +final class SectionHandler extends IdentifiableHandlerImpl
{ - private final OrderedLinkSyncHandler sectionDataElementLinkHandler; - private final SyncHandler greyedFieldsHandler; - private final LinkSyncHandler sectionGreyedFieldsLinkHandler; + private final OrderedLinkHandler sectionDataElementLinkHandler; + private final Handler greyedFieldsHandler; + private final LinkHandler sectionGreyedFieldsLinkHandler; @Inject SectionHandler(IdentifiableObjectStore
sectionStore, - OrderedLinkSyncHandler sectionDataElementLinkHandler, - SyncHandler greyedFieldsHandler, - LinkSyncHandler sectionGreyedFieldsLinkHandler) { + OrderedLinkHandler sectionDataElementLinkHandler, + Handler greyedFieldsHandler, + LinkHandler sectionGreyedFieldsLinkHandler) { super(sectionStore); this.sectionDataElementLinkHandler = sectionDataElementLinkHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java index 7a654109e1..e0297e5007 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.datavalue; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadResourceCallFetcher; @@ -49,12 +49,12 @@ final class DataValueEndpointCallFactory extends QueryCallFactoryImpl { private final Resource.Type resourceType = Resource.Type.DATA_VALUE; - private final SyncHandler dataValueHandler; + private final Handler dataValueHandler; @Inject DataValueEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, - SyncHandler dataValueHandler) { + Handler dataValueHandler) { super(data, apiCallExecutor); this.dataValueHandler = dataValueHandler; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java index 007b4cbd9b..e9e1856b6f 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.datavalue; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -51,8 +51,8 @@ DataValueStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - SyncHandler handler(DataValueStore dataValueStore) { - return new ObjectWithoutUidSyncHandlerImpl<>(dataValueStore); + Handler handler(DataValueStore dataValueStore) { + return new ObjectWithoutUidHandlerImpl<>(dataValueStore); } @Provides diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java index cdc85bb902..c7f173d1ba 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.BaseDataModel; import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl; @@ -59,7 +59,7 @@ public EnrollmentStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - public SyncHandlerWithTransformer handler(EnrollmentHandler impl) { + public HandlerWithTransformer handler(EnrollmentHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java index df48c21835..942dedd210 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentHandler.java @@ -28,9 +28,9 @@ package org.hisp.dhis.android.core.enrollment; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; import org.hisp.dhis.android.core.common.State; @@ -49,19 +49,19 @@ import dagger.Reusable; @Reusable -final class EnrollmentHandler extends IdentifiableDataSyncHandlerImpl { +final class EnrollmentHandler extends IdentifiableDataHandlerImpl { private final NoteDHISVersionManager noteVersionManager; - private final SyncHandlerWithTransformer eventHandler; - private final SyncHandler noteHandler; + private final HandlerWithTransformer eventHandler; + private final Handler noteHandler; private final NoteUniquenessManager noteUniquenessManager; private final OrphanCleaner eventOrphanCleaner; @Inject EnrollmentHandler(@NonNull NoteDHISVersionManager noteVersionManager, @NonNull EnrollmentStore enrollmentStore, - @NonNull SyncHandlerWithTransformer eventHandler, + @NonNull HandlerWithTransformer eventHandler, @NonNull OrphanCleaner eventOrphanCleaner, - @NonNull SyncHandler noteHandler, + @NonNull Handler noteHandler, @NonNull NoteUniquenessManager noteUniquenessManager) { super(enrollmentStore); this.noteVersionManager = noteVersionManager; diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java index 4d13abe181..e9ab367c9c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/note/NoteEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.enrollment.note; -import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,7 +48,7 @@ public ObjectWithoutUidStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - public SyncHandler handler(ObjectWithoutUidStore store) { - return new ObjectWithoutUidSyncHandlerImpl<>(store); + public Handler handler(ObjectWithoutUidStore store) { + return new ObjectWithoutUidHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java index 8a36191db2..5bf0c3ded6 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.common.Transformer; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -52,7 +52,7 @@ public EventStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - public SyncHandlerWithTransformer handler(EventHandler impl) { + public HandlerWithTransformer handler(EventHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java index 029c7e37e2..4dcbceb82c 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventHandler.java @@ -30,8 +30,8 @@ import android.util.Log; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue; @@ -40,12 +40,12 @@ import dagger.Reusable; @Reusable -final class EventHandler extends IdentifiableDataSyncHandlerImpl { - private final SyncHandlerWithTransformer trackedEntityDataValueHandler; +final class EventHandler extends IdentifiableDataHandlerImpl { + private final HandlerWithTransformer trackedEntityDataValueHandler; @Inject EventHandler(EventStore eventStore, - SyncHandlerWithTransformer trackedEntityDataValueHandler) { + HandlerWithTransformer trackedEntityDataValueHandler) { super(eventStore); this.trackedEntityDataValueHandler = trackedEntityDataValueHandler; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java index c0f437a05d..5773264e25 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventPersistenceCallFactory.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.event; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore; import org.hisp.dhis.android.core.common.State; @@ -52,7 +52,7 @@ @Reusable final class EventPersistenceCallFactory { - private final SyncHandlerWithTransformer eventHandler; + private final HandlerWithTransformer eventHandler; private final ObjectWithoutUidStore authenticatedUserStore; private final IdentifiableObjectStore organisationUnitStore; private final OrganisationUnitModuleDownloader organisationUnitDownloader; @@ -60,7 +60,7 @@ final class EventPersistenceCallFactory { @Inject EventPersistenceCallFactory( - @NonNull SyncHandlerWithTransformer eventHandler, + @NonNull HandlerWithTransformer eventHandler, @NonNull ObjectWithoutUidStore authenticatedUserStore, @NonNull IdentifiableObjectStore organisationUnitStore, @NonNull OrganisationUnitModuleDownloader organisationUnitDownloader, diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java index 7be94b397c..21647cba20 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/DataSetIndicatorEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.indicator; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandler; -import org.hisp.dhis.android.core.arch.handlers.internal.LinkSyncHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.LinkModelStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,7 +48,7 @@ LinkModelStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - LinkSyncHandler handler(LinkModelStore store) { - return new LinkSyncHandlerImpl<>(store); + LinkHandler handler(LinkModelStore store) { + return new LinkHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java index 107810cdc0..a5e52fbf6e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; @@ -49,7 +49,7 @@ final class IndicatorEndpointCallFactory extends UidsCallFactoryImpl { private final IndicatorService service; - private final SyncHandler handler; + private final Handler handler; private static final int MAX_UID_LIST_SIZE = 100; @@ -57,7 +57,7 @@ final class IndicatorEndpointCallFactory extends UidsCallFactoryImpl IndicatorEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, IndicatorService service, - SyncHandler handler) { + Handler handler) { super(data, apiCallExecutor); this.service = service; this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java index 7d6a02c508..04844ad3df 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -55,8 +55,8 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) @Override @Provides @Reusable - public SyncHandler handler(IdentifiableObjectStore store) { - return new IdentifiableSyncHandlerImpl<>(store); + public Handler handler(IdentifiableObjectStore store) { + return new IdentifiableHandlerImpl<>(store); } @Provides diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java index 32402cd7c9..7171ef40e9 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEndpointCallFactory.java @@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.api.internal.APICallExecutor; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl; import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher; import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher; @@ -51,13 +51,13 @@ final class IndicatorTypeEndpointCallFactory extends UidsCallFactoryImpl handler; + private final Handler handler; @Inject IndicatorTypeEndpointCallFactory(GenericCallData data, APICallExecutor apiCallExecutor, IndicatorTypeService service, - SyncHandler handler) { + Handler handler) { super(data, apiCallExecutor); this.service = service; this.handler = handler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java index 9fce2e5326..27b8243fc1 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeEntityDIModule.java @@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.indicator; import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -55,8 +55,8 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAdap @Override @Provides @Reusable - public SyncHandler handler(IdentifiableObjectStore store) { - return new IdentifiableSyncHandlerImpl<>(store); + public Handler handler(IdentifiableObjectStore store) { + return new IdentifiableHandlerImpl<>(store); } @Provides diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java index cab62d97c6..f148b92997 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendEntityDIModule.java @@ -28,8 +28,8 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.data.database.DatabaseAdapter; @@ -48,7 +48,7 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) { @Provides @Reusable - public SyncHandlerWithTransformer handler(IdentifiableObjectStore store) { - return new IdentifiableSyncHandlerImpl<>(store); + public HandlerWithTransformer handler(IdentifiableObjectStore store) { + return new IdentifiableHandlerImpl<>(store); } } \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java index 08288d08b9..a4411982bf 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner; @@ -53,7 +53,7 @@ public IdentifiableObjectStore store(DatabaseAdapter databaseAdapter) @Provides @Reusable - public SyncHandler handler(LegendSetHandler impl) { + public Handler handler(LegendSetHandler impl) { return impl; } diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java index 8abdbc74fc..23f5d9a233 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java +++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetHandler.java @@ -27,8 +27,8 @@ */ package org.hisp.dhis.android.core.legendset; -import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableSyncHandlerImpl; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandlerWithTransformer; +import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl; +import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer; import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectWithUid; @@ -39,14 +39,14 @@ import dagger.Reusable; @Reusable -final class LegendSetHandler extends IdentifiableSyncHandlerImpl { +final class LegendSetHandler extends IdentifiableHandlerImpl { - private final SyncHandlerWithTransformer legendHandler; + private final HandlerWithTransformer legendHandler; private final OrphanCleaner legendCleaner; @Inject LegendSetHandler(IdentifiableObjectStore legendSetStore, - SyncHandlerWithTransformer legendHandler, + HandlerWithTransformer legendHandler, OrphanCleaner legendCleaner) { super(legendSetStore); this.legendHandler = legendHandler; diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java index 4284536453..fad8a97fc2 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java +++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionEntityDIModule.java @@ -28,7 +28,7 @@ package org.hisp.dhis.android.core.option; -import org.hisp.dhis.android.core.arch.handlers.internal.SyncHandler; +import org.hisp.dhis.android.core.arch.handlers.internal.Handler; import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender; import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore; import org.hisp.dhis.android.core.common.ObjectStyleChildrenAppender; @@ -53,7 +53,7 @@ public IdentifiableObjectStore