From 3b9042b95ef5cbed91da955bac29e9d79330de18 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 9 Jun 2020 20:49:13 +0200 Subject: [PATCH] Rename repository implementations and remove scheduling from the data module --- .../messenger/data/di/RepositoryModule.java | 56 ++++++---------- .../data/repository/RequeryRepository.java | 23 +------ ...pository.java => RxAccountRepository.java} | 59 +++++----------- ...itory.java => RxDirectChatRepository.java} | 53 ++++----------- ...itory.java => RxEntityCapsRepository.java} | 22 ++---- ...sitory.java => RxGroupChatRepository.java} | 57 +++++----------- ...pository.java => RxMessageRepository.java} | 49 ++++---------- ...rRepository.java => RxPeerRepository.java} | 67 +++++-------------- .../InMemoryDatabaseComponent.java | 5 +- .../{ => component}/MappingTestComponent.java | 3 +- .../di/{ => module}/TestDatabaseModule.java | 2 +- .../{ => module}/TestingSchedulerModule.java | 8 +-- .../data/mapping/AccountMappingTest.java | 7 +- .../data/mapping/EntityCapsMappingTest.java | 4 +- .../data/mapping/PeerMappingTest.java | 4 +- .../repository/AccountRepositoryTest.java | 23 ++++--- 16 files changed, 135 insertions(+), 307 deletions(-) rename data/src/main/java/org/mercury_im/messenger/data/repository/{XmppAccountRepository.java => RxAccountRepository.java} (65%) rename data/src/main/java/org/mercury_im/messenger/data/repository/{XmppDirectChatRepository.java => RxDirectChatRepository.java} (69%) rename data/src/main/java/org/mercury_im/messenger/data/repository/{XmppEntityCapsRepository.java => RxEntityCapsRepository.java} (75%) rename data/src/main/java/org/mercury_im/messenger/data/repository/{XmppGroupChatRepository.java => RxGroupChatRepository.java} (68%) rename data/src/main/java/org/mercury_im/messenger/data/repository/{XmppMessageRepository.java => RxMessageRepository.java} (79%) rename data/src/main/java/org/mercury_im/messenger/data/repository/{XmppPeerRepository.java => RxPeerRepository.java} (71%) rename data/src/test/java/org/mercury_im/messenger/data/di/{ => component}/InMemoryDatabaseComponent.java (59%) rename data/src/test/java/org/mercury_im/messenger/data/di/{ => component}/MappingTestComponent.java (81%) rename data/src/test/java/org/mercury_im/messenger/data/di/{ => module}/TestDatabaseModule.java (97%) rename data/src/test/java/org/mercury_im/messenger/data/di/{ => module}/TestingSchedulerModule.java (70%) diff --git a/data/src/main/java/org/mercury_im/messenger/data/di/RepositoryModule.java b/data/src/main/java/org/mercury_im/messenger/data/di/RepositoryModule.java index e67317b..4139151 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/di/RepositoryModule.java +++ b/data/src/main/java/org/mercury_im/messenger/data/di/RepositoryModule.java @@ -1,32 +1,29 @@ package org.mercury_im.messenger.data.di; +import org.mercury_im.messenger.core.data.repository.AccountRepository; +import org.mercury_im.messenger.core.data.repository.DirectChatRepository; +import org.mercury_im.messenger.core.data.repository.EntityCapsRepository; +import org.mercury_im.messenger.core.data.repository.GroupChatRepository; +import org.mercury_im.messenger.core.data.repository.MessageRepository; +import org.mercury_im.messenger.core.data.repository.PeerRepository; +import org.mercury_im.messenger.core.data.repository.Repositories; import org.mercury_im.messenger.data.mapping.AccountMapping; import org.mercury_im.messenger.data.mapping.DirectChatMapping; import org.mercury_im.messenger.data.mapping.EntityCapsMapping; import org.mercury_im.messenger.data.mapping.GroupChatMapping; import org.mercury_im.messenger.data.mapping.MessageMapping; import org.mercury_im.messenger.data.mapping.PeerMapping; -import org.mercury_im.messenger.core.data.repository.AccountRepository; -import org.mercury_im.messenger.core.data.repository.EntityCapsRepository; -import org.mercury_im.messenger.core.data.repository.GroupChatRepository; -import org.mercury_im.messenger.core.data.repository.MessageRepository; -import org.mercury_im.messenger.core.data.repository.PeerRepository; -import org.mercury_im.messenger.core.data.repository.DirectChatRepository; -import org.mercury_im.messenger.data.repository.XmppEntityCapsRepository; -import org.mercury_im.messenger.core.data.repository.Repositories; -import org.mercury_im.messenger.data.repository.XmppAccountRepository; -import org.mercury_im.messenger.data.repository.XmppDirectChatRepository; -import org.mercury_im.messenger.data.repository.XmppGroupChatRepository; -import org.mercury_im.messenger.data.repository.XmppMessageRepository; -import org.mercury_im.messenger.data.repository.XmppPeerRepository; -import org.mercury_im.messenger.core.util.ThreadUtils; +import org.mercury_im.messenger.data.repository.RxAccountRepository; +import org.mercury_im.messenger.data.repository.RxDirectChatRepository; +import org.mercury_im.messenger.data.repository.RxEntityCapsRepository; +import org.mercury_im.messenger.data.repository.RxGroupChatRepository; +import org.mercury_im.messenger.data.repository.RxMessageRepository; +import org.mercury_im.messenger.data.repository.RxPeerRepository; -import javax.inject.Named; import javax.inject.Singleton; import dagger.Module; import dagger.Provides; -import io.reactivex.Scheduler; import io.requery.Persistable; import io.requery.reactivex.ReactiveEntityStore; @@ -40,64 +37,51 @@ public class RepositoryModule { @Singleton static AccountRepository provideAccountRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler ioScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler uiScheduler, AccountMapping accountMapping) { - return new XmppAccountRepository(data, ioScheduler, uiScheduler, accountMapping); + return new RxAccountRepository(data, accountMapping); } @Provides @Singleton static PeerRepository providePeerRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler ioScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler uiScheduler, PeerMapping peerMapping, AccountRepository accountRepository) { - return new XmppPeerRepository(data, ioScheduler, uiScheduler, peerMapping, accountRepository); + return new RxPeerRepository(data, peerMapping, accountRepository); } @Provides @Singleton static DirectChatRepository provideDirectChatRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler ioScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler uiScheduler, DirectChatMapping directChatMapping) { - return new XmppDirectChatRepository(data, ioScheduler, uiScheduler, directChatMapping); + return new RxDirectChatRepository(data, directChatMapping); } @Provides @Singleton static GroupChatRepository provideGroupChatRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler ioScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler uiScheduler, GroupChatMapping groupChatMapping) { - return new XmppGroupChatRepository(data, ioScheduler, uiScheduler, groupChatMapping); + return new RxGroupChatRepository(data, groupChatMapping); } @Provides @Singleton static MessageRepository provideMessageRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler ioScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler uiScheduler, MessageMapping messageMapping, DirectChatMapping directChatMapping, GroupChatMapping groupChatMapping) { - return new XmppMessageRepository(data, ioScheduler, uiScheduler, - messageMapping, directChatMapping, groupChatMapping); + return new RxMessageRepository(data, messageMapping, directChatMapping, groupChatMapping); } @Provides @Singleton static EntityCapsRepository provideCapsRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler ioScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler uiScheduler, EntityCapsMapping entityCapsMapping) { - return new XmppEntityCapsRepository(data, ioScheduler, uiScheduler, entityCapsMapping); + return new RxEntityCapsRepository(data, entityCapsMapping); } @Provides @@ -108,7 +92,7 @@ public class RepositoryModule { GroupChatRepository groupChatRepository, MessageRepository messageRepository, PeerRepository peerRepository, - XmppEntityCapsRepository entityCapsRepository) { + RxEntityCapsRepository entityCapsRepository) { return new Repositories(accountRepository, directChatRepository, groupChatRepository, messageRepository, peerRepository, entityCapsRepository); } diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java index 87861b5..ab1df56 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java @@ -1,38 +1,17 @@ package org.mercury_im.messenger.data.repository; -import org.mercury_im.messenger.core.util.ThreadUtils; - -import javax.inject.Named; - -import io.reactivex.Scheduler; import io.requery.Persistable; import io.requery.reactivex.ReactiveEntityStore; public abstract class RequeryRepository { - private final Scheduler subscriberScheduler; - private final Scheduler observerScheduler; - private final ReactiveEntityStore data; - protected RequeryRepository(ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler) { + protected RequeryRepository(ReactiveEntityStore data) { this.data = data; - this.subscriberScheduler = subscriberScheduler; - this.observerScheduler = observerScheduler; } protected ReactiveEntityStore data() { return data; } - - protected Scheduler subscriberScheduler() { - return subscriberScheduler; - } - - protected Scheduler observerScheduler() { - return observerScheduler; - } - } diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxAccountRepository.java similarity index 65% rename from data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RxAccountRepository.java index d9dcbb2..a02bc09 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxAccountRepository.java @@ -1,31 +1,28 @@ package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.core.data.repository.AccountRepository; +import org.mercury_im.messenger.core.util.Optional; import org.mercury_im.messenger.data.mapping.AccountMapping; import org.mercury_im.messenger.data.model.AccountModel; import org.mercury_im.messenger.data.repository.dao.AccountDao; import org.mercury_im.messenger.entity.Account; -import org.mercury_im.messenger.core.util.Optional; -import org.mercury_im.messenger.core.util.ThreadUtils; import java.util.ArrayList; import java.util.List; import java.util.UUID; import javax.inject.Inject; -import javax.inject.Named; import io.reactivex.Completable; import io.reactivex.Maybe; import io.reactivex.Observable; -import io.reactivex.Scheduler; import io.reactivex.Single; import io.requery.Persistable; import io.requery.query.ResultDelegate; import io.requery.reactivex.ReactiveEntityStore; import io.requery.reactivex.ReactiveResult; -public class XmppAccountRepository +public class RxAccountRepository extends RequeryRepository implements AccountRepository { @@ -33,11 +30,9 @@ public class XmppAccountRepository private final AccountDao dao; @Inject - public XmppAccountRepository(ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler, - AccountMapping accountMapping) { - super(data, subscriberScheduler, observerScheduler); + public RxAccountRepository(ReactiveEntityStore data, + AccountMapping accountMapping) { + super(data); this.accountMapping = accountMapping; this.dao = new AccountDao(data); } @@ -47,61 +42,47 @@ public class XmppAccountRepository return Single.just(account) .map(accountMapping::toModel) .flatMap(dao::insert) - .map(model -> accountMapping.toEntity(model, account)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> accountMapping.toEntity(model, account)); } @Override public Observable> observeAccount(UUID accountId) { return dao.get(accountId).observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(accountMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(accountMapping::toEntity); } @Override public Maybe getAccount(UUID accountId) { return dao.get(accountId).maybe() - .map(accountMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(accountMapping::toEntity); } @Override public Observable> observeAccountByAddress(String address) { return dao.get(address).observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(accountMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(accountMapping::toEntity); } @Override public Maybe getAccountByAddress(String address) { return dao.get(address).maybe() - .map(accountMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(accountMapping::toEntity); } @Override public Observable> observeAllAccounts() { return dao.getAll().observableResult() .map(ResultDelegate::toList) - .map(this::modelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::modelsToEntities); } @Override public Observable observeAccounts() { return dao.getAll().observableResult() .flatMap(ReactiveResult::observable) - .map(accountMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(accountMapping::toEntity); } @Override @@ -112,9 +93,7 @@ public class XmppAccountRepository return dao.get(account.getId()).maybe().toSingle() .map(model -> accountMapping.toModel(account, model)) .flatMap(updatedModel -> data().update(updatedModel)) - .map(model -> accountMapping.toEntity(model, account)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> accountMapping.toEntity(model, account)); } @Override @@ -124,16 +103,12 @@ public class XmppAccountRepository Single.just(account).map(accountMapping::toModel).flatMap(dao::insert)) .map(model -> accountMapping.toModel(account, model)) .flatMap(data()::update) - .map(model -> accountMapping.toEntity(model, account)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> accountMapping.toEntity(model, account)); } @Override public Completable deleteAccount(UUID accountId) { - return dao.delete(accountId).ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + return dao.delete(accountId).ignoreElement(); } @Override @@ -141,9 +116,7 @@ public class XmppAccountRepository return data().update(AccountModel.class) .set(AccountModel.ROSTER_VERSION, rosterVersion) .where(AccountModel.ID.eq(accountId)) - .get().single().ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .get().single().ignoreElement(); } private List modelsToEntities(List models) { diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppDirectChatRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxDirectChatRepository.java similarity index 69% rename from data/src/main/java/org/mercury_im/messenger/data/repository/XmppDirectChatRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RxDirectChatRepository.java index 32dddb4..06bd469 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppDirectChatRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxDirectChatRepository.java @@ -1,31 +1,28 @@ package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.core.data.repository.DirectChatRepository; +import org.mercury_im.messenger.core.util.Optional; import org.mercury_im.messenger.data.mapping.DirectChatMapping; import org.mercury_im.messenger.data.model.DirectChatModel; import org.mercury_im.messenger.data.repository.dao.DirectChatDao; -import org.mercury_im.messenger.core.util.Optional; import org.mercury_im.messenger.entity.chat.DirectChat; import org.mercury_im.messenger.entity.contact.Peer; -import org.mercury_im.messenger.core.util.ThreadUtils; import java.util.ArrayList; import java.util.List; import java.util.UUID; import javax.inject.Inject; -import javax.inject.Named; import io.reactivex.Completable; import io.reactivex.Maybe; import io.reactivex.Observable; -import io.reactivex.Scheduler; import io.reactivex.Single; import io.requery.Persistable; import io.requery.query.ResultDelegate; import io.requery.reactivex.ReactiveEntityStore; -public class XmppDirectChatRepository +public class RxDirectChatRepository extends RequeryRepository implements DirectChatRepository { @@ -34,12 +31,10 @@ public class XmppDirectChatRepository private final DirectChatDao dao; @Inject - public XmppDirectChatRepository( + public RxDirectChatRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler, DirectChatMapping directChatMapping) { - super(data, subscriberScheduler, observerScheduler); + super(data); this.directChatMapping = directChatMapping; this.dao = new DirectChatDao(data); } @@ -51,26 +46,20 @@ public class XmppDirectChatRepository .map(directChatMapping::toModel) .flatMap(dao::insert) // map back to entity - .map(model -> directChatMapping.toEntity(model, chat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> directChatMapping.toEntity(model, chat)); } @Override public Observable> observeDirectChat(UUID chatId) { return dao.get(chatId).observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(directChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(directChatMapping::toEntity); } @Override public Maybe getDirectChat(UUID chatId) { return dao.get(chatId).maybe() - .map(directChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(directChatMapping::toEntity); } @Override @@ -82,35 +71,27 @@ public class XmppDirectChatRepository chat.setPeer(peer); return chat; }) - .flatMap(this::insertDirectChat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .flatMap(this::insertDirectChat)); } @Override public Observable> observeDirectChatByPeer(Peer peer) { return dao.getByPeer(peer.getId()).observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(directChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(directChatMapping::toEntity); } @Override public Maybe getDirectChatByPeer(Peer peer) { return dao.getByPeer(peer.getId()).maybe() - .map(directChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(directChatMapping::toEntity); } @Override public Observable> observeAllDirectChats() { return dao.getAll().observableResult() .map(ResultDelegate::toList) - .map(this::chatModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::chatModelsToEntities); } private List chatModelsToEntities(List models) { @@ -126,9 +107,7 @@ public class XmppDirectChatRepository return dao.get(chat.getId()).maybe().toSingle() .map(model -> directChatMapping.toModel(chat, model)) .flatMap(data()::update) - .map(model -> directChatMapping.toEntity(model, chat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> directChatMapping.toEntity(model, chat)); } @Override @@ -137,16 +116,12 @@ public class XmppDirectChatRepository .switchIfEmpty(dao.insert(directChatMapping.toModel(chat))) .map(directChatModel -> directChatMapping.toModel(chat, directChatModel)) .flatMap(data()::update) - .map(model -> directChatMapping.toEntity(model, chat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> directChatMapping.toEntity(model, chat)); } @Override public Completable deleteDirectChat(UUID chatId) { return dao.delete(chatId) - .ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .ignoreElement(); } } diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppEntityCapsRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxEntityCapsRepository.java similarity index 75% rename from data/src/main/java/org/mercury_im/messenger/data/repository/XmppEntityCapsRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RxEntityCapsRepository.java index 467585b..d509f36 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppEntityCapsRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxEntityCapsRepository.java @@ -1,10 +1,10 @@ package org.mercury_im.messenger.data.repository; +import org.mercury_im.messenger.core.SchedulersFacade; import org.mercury_im.messenger.core.data.repository.EntityCapsRepository; import org.mercury_im.messenger.data.mapping.EntityCapsMapping; import org.mercury_im.messenger.data.model.EntityCapsModel; import org.mercury_im.messenger.entity.caps.EntityCapsRecord; -import org.mercury_im.messenger.core.util.ThreadUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -20,17 +20,15 @@ import io.requery.Persistable; import io.requery.reactivex.ReactiveEntityStore; import io.requery.reactivex.ReactiveResult; -public class XmppEntityCapsRepository extends RequeryRepository implements EntityCapsRepository { +public class RxEntityCapsRepository extends RequeryRepository implements EntityCapsRepository { private final EntityCapsMapping entityCapsMapping; @Inject - public XmppEntityCapsRepository( + public RxEntityCapsRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler, EntityCapsMapping mapping) { - super(data, subscriberScheduler, observerScheduler); + super(data); this.entityCapsMapping = mapping; } @@ -39,9 +37,7 @@ public class XmppEntityCapsRepository extends RequeryRepository implements Entit return data().select(EntityCapsModel.class).get() .observableResult() .map(result -> result.toMap(EntityCapsModel.NODE_VER, new ConcurrentHashMap<>())) - .map(this::mapModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::mapModelsToEntities); } private Map mapModelsToEntities(Map models) { @@ -65,9 +61,7 @@ public class XmppEntityCapsRepository extends RequeryRepository implements Entit return data().select(EntityCapsModel.class) .get().observableResult() .flatMap(ReactiveResult::observable) - .map(entityCapsMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(entityCapsMapping::toEntity); } @Override @@ -81,8 +75,6 @@ public class XmppEntityCapsRepository extends RequeryRepository implements Entit @Override public Completable insertEntityCapsRecord(EntityCapsRecord entityCapsRecord) { return data().upsert(entityCapsMapping.toModel(entityCapsRecord)) - .ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .ignoreElement(); } } diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppGroupChatRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxGroupChatRepository.java similarity index 68% rename from data/src/main/java/org/mercury_im/messenger/data/repository/XmppGroupChatRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RxGroupChatRepository.java index bd7bbbe..5a5b09f 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppGroupChatRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxGroupChatRepository.java @@ -1,31 +1,28 @@ package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.core.data.repository.GroupChatRepository; +import org.mercury_im.messenger.core.util.Optional; import org.mercury_im.messenger.data.mapping.GroupChatMapping; import org.mercury_im.messenger.data.model.GroupChatModel; import org.mercury_im.messenger.data.repository.dao.GroupChatDao; -import org.mercury_im.messenger.core.util.Optional; import org.mercury_im.messenger.entity.Account; import org.mercury_im.messenger.entity.chat.GroupChat; -import org.mercury_im.messenger.core.util.ThreadUtils; import java.util.ArrayList; import java.util.List; import java.util.UUID; import javax.inject.Inject; -import javax.inject.Named; import io.reactivex.Completable; import io.reactivex.Maybe; import io.reactivex.Observable; -import io.reactivex.Scheduler; import io.reactivex.Single; import io.requery.Persistable; import io.requery.query.ResultDelegate; import io.requery.reactivex.ReactiveEntityStore; -public class XmppGroupChatRepository +public class RxGroupChatRepository extends RequeryRepository implements GroupChatRepository { @@ -34,12 +31,10 @@ public class XmppGroupChatRepository private final GroupChatDao dao; @Inject - public XmppGroupChatRepository( + public RxGroupChatRepository( ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler, GroupChatMapping groupChatMapping) { - super(data, subscriberScheduler, observerScheduler); + super(data); this.groupChatMapping = groupChatMapping; this.dao = new GroupChatDao(data); } @@ -49,26 +44,20 @@ public class XmppGroupChatRepository return Single.just(chat) .map(groupChatMapping::toModel) .flatMap(dao::insert) - .map(model -> groupChatMapping.toEntity(model, chat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> groupChatMapping.toEntity(model, chat)); } @Override public Observable> observeGroupChat(UUID chatId) { return dao.get(chatId).observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(groupChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(groupChatMapping::toEntity); } @Override public Maybe getGroupChat(UUID chatId) { return dao.get(chatId).maybe() - .map(groupChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(groupChatMapping::toEntity); } @Override @@ -80,35 +69,27 @@ public class XmppGroupChatRepository chat.setRoomAddress(roomAddress); return chat; }) - .flatMap(this::insertGroupChat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .flatMap(this::insertGroupChat)); } @Override public Observable> observeGroupChatByRoomAddress(UUID accountId, String roomAddress) { return dao.get(accountId, roomAddress).observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(groupChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(groupChatMapping::toEntity); } @Override public Maybe getGroupChatByRoomAddress(UUID accountId, String roomAddress) { return dao.get(accountId, roomAddress).maybe() - .map(groupChatMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(groupChatMapping::toEntity); } @Override public Observable> observeAllGroupChats() { return dao.getAll().observableResult() .map(ResultDelegate::toList) - .map(this::modelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::modelsToEntities); } @Override @@ -117,9 +98,7 @@ public class XmppGroupChatRepository .where(GroupChatModel.ACCOUNT_ID.eq(accountId)) .get().observableResult() .map(ResultDelegate::toList) - .map(this::modelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::modelsToEntities); } private List modelsToEntities(List models) { @@ -135,9 +114,7 @@ public class XmppGroupChatRepository return dao.get(chat.getId()).maybe().toSingle() .map(model -> groupChatMapping.toModel(chat, model)) .flatMap(data()::update) - .map(model -> groupChatMapping.toEntity(model, chat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> groupChatMapping.toEntity(model, chat)); } @Override @@ -147,15 +124,11 @@ public class XmppGroupChatRepository .flatMap(dao::insert)) .map(model -> groupChatMapping.toModel(chat, model)) .flatMap(data()::update) - .map(model -> groupChatMapping.toEntity(model, chat)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> groupChatMapping.toEntity(model, chat)); } @Override public Completable deleteGroupChat(UUID chatId) { - return dao.delete(chatId).ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + return dao.delete(chatId).ignoreElement(); } } diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppMessageRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxMessageRepository.java similarity index 79% rename from data/src/main/java/org/mercury_im/messenger/data/repository/XmppMessageRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RxMessageRepository.java index 0ce58f2..8a09be4 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppMessageRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxMessageRepository.java @@ -15,23 +15,20 @@ import org.mercury_im.messenger.data.repository.dao.MessageDao; import org.mercury_im.messenger.entity.chat.DirectChat; import org.mercury_im.messenger.entity.chat.GroupChat; import org.mercury_im.messenger.entity.message.Message; -import org.mercury_im.messenger.core.util.ThreadUtils; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; -import javax.inject.Named; import io.reactivex.Completable; import io.reactivex.Observable; -import io.reactivex.Scheduler; import io.reactivex.Single; import io.requery.Persistable; import io.requery.query.ResultDelegate; import io.requery.reactivex.ReactiveEntityStore; -public class XmppMessageRepository +public class RxMessageRepository extends RequeryRepository implements MessageRepository { @@ -46,13 +43,11 @@ public class XmppMessageRepository @Inject - public XmppMessageRepository(ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler, - MessageMapping messageMapping, - DirectChatMapping directChatMapping, - GroupChatMapping groupChatMapping) { - super(data, subscriberScheduler, observerScheduler); + public RxMessageRepository(ReactiveEntityStore data, + MessageMapping messageMapping, + DirectChatMapping directChatMapping, + GroupChatMapping groupChatMapping) { + super(data); this.messageMapping = messageMapping; this.directChatMapping = directChatMapping; this.groupChatMapping = groupChatMapping; @@ -68,9 +63,7 @@ public class XmppMessageRepository .map(chatModel -> toRelation(chatModel, messageMapping.toModel(message))) .flatMap(data()::insert) .map(DirectMessagesRelation::getMessage) - .map(messageModel -> messageMapping.toEntity(messageModel, message)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(messageModel -> messageMapping.toEntity(messageModel, message)); } @Override @@ -80,9 +73,7 @@ public class XmppMessageRepository .map(chatModel -> toRelation(chatModel, messageMapping.toModel(message))) .flatMap(data()::insert) .map(GroupMessagesRelation::getMessage) - .map(messageModel -> messageMapping.toEntity(messageModel, message)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(messageModel -> messageMapping.toEntity(messageModel, message)); } @Override @@ -94,9 +85,7 @@ public class XmppMessageRepository .where(DirectMessagesRelation.CHAT_ID.eq(chat.getId())) .get().observableResult() .map(ResultDelegate::toList) - .map(this::messageModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::messageModelsToEntities); } @Override @@ -108,9 +97,7 @@ public class XmppMessageRepository .where(GroupMessagesRelation.CHAT_ID.eq(chat.getId())) .get().observableResult() .map(ResultDelegate::toList) - .map(this::messageModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::messageModelsToEntities); } @Override @@ -120,9 +107,7 @@ public class XmppMessageRepository .where(MessageModel.BODY.eq(body)) .get().observableResult() .map(ResultDelegate::toList) - .map(this::messageModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::messageModelsToEntities); } @Override @@ -137,9 +122,7 @@ public class XmppMessageRepository .and(DirectMessagesRelation.CHAT_ID.eq(chat.getId())) .get().observableResult() .map(ResultDelegate::toList) - .map(this::messageModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::messageModelsToEntities); } @Override @@ -154,9 +137,7 @@ public class XmppMessageRepository .and(GroupMessagesRelation.CHAT_ID.eq(chat.getId())) .get().observableResult() .map(ResultDelegate::toList) - .map(this::messageModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::messageModelsToEntities); } @Override @@ -174,9 +155,7 @@ public class XmppMessageRepository return dao.get(message.getId()).maybe().toSingle() .map(model -> messageMapping.toModel(message, model)) .flatMap(data()::update) - .map(model -> messageMapping.toEntity(model, message)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> messageMapping.toEntity(model, message)); } @Override diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxPeerRepository.java similarity index 71% rename from data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RxPeerRepository.java index ab973ae..35309b8 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxPeerRepository.java @@ -2,30 +2,27 @@ package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.core.data.repository.AccountRepository; import org.mercury_im.messenger.core.data.repository.PeerRepository; +import org.mercury_im.messenger.core.util.Optional; import org.mercury_im.messenger.data.mapping.PeerMapping; import org.mercury_im.messenger.data.model.PeerModel; import org.mercury_im.messenger.entity.Account; import org.mercury_im.messenger.entity.contact.Peer; -import org.mercury_im.messenger.core.util.Optional; -import org.mercury_im.messenger.core.util.ThreadUtils; import java.util.ArrayList; import java.util.List; import java.util.UUID; import javax.inject.Inject; -import javax.inject.Named; import io.reactivex.Completable; import io.reactivex.Maybe; import io.reactivex.Observable; -import io.reactivex.Scheduler; import io.reactivex.Single; import io.requery.Persistable; import io.requery.query.ResultDelegate; import io.requery.reactivex.ReactiveEntityStore; -public class XmppPeerRepository +public class RxPeerRepository extends RequeryRepository implements PeerRepository { @@ -34,11 +31,9 @@ public class XmppPeerRepository private final PeerMapping peerMapping; @Inject - public XmppPeerRepository(ReactiveEntityStore data, - @Named(value = ThreadUtils.SCHEDULER_IO) Scheduler subscriberScheduler, - @Named(value = ThreadUtils.SCHEDULER_UI) Scheduler observerScheduler, - PeerMapping peerMapping, AccountRepository accountRepository) { - super(data, subscriberScheduler, observerScheduler); + public RxPeerRepository(ReactiveEntityStore data, + PeerMapping peerMapping, AccountRepository accountRepository) { + super(data); this.peerMapping = peerMapping; this.accountRepository = accountRepository; } @@ -46,9 +41,7 @@ public class XmppPeerRepository @Override public Single insertPeer(Peer peer) { return data().insert(peerMapping.toModel(peer, new PeerModel())) - .map(model -> peerMapping.toEntity(model, peer)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> peerMapping.toEntity(model, peer)); } @Override @@ -56,9 +49,7 @@ public class XmppPeerRepository return data().select(PeerModel.class) .where(PeerModel.ID.eq(peerId)) .get().observableResult() - .map(result -> new Optional<>(peerMapping.toEntity(result.firstOrNull(), new Peer()))) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(result -> new Optional<>(peerMapping.toEntity(result.firstOrNull(), new Peer()))); } @Override @@ -66,9 +57,7 @@ public class XmppPeerRepository return data().select(PeerModel.class) .where(PeerModel.ID.eq(peerId)) .get().maybe() - .map(model -> peerMapping.toEntity(model, new Peer())) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> peerMapping.toEntity(model, new Peer())); } @Override @@ -78,9 +67,7 @@ public class XmppPeerRepository .and(PeerModel.ADDRESS.eq(address)) .get().observableResult() .map(result -> new Optional<>(result.firstOrNull())) - .map(peerMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(peerMapping::toEntity); } @Override @@ -95,9 +82,7 @@ public class XmppPeerRepository .where(PeerModel.ACCOUNT_ID.eq(accountId)) .and(PeerModel.ADDRESS.eq(address)) .get().maybe() - .map(peerMapping::toEntity) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(peerMapping::toEntity); } @Override @@ -110,9 +95,7 @@ public class XmppPeerRepository peer.setAddress(address); return peer; }) - .flatMap(this::insertPeer)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .flatMap(this::insertPeer)); } @Override @@ -121,9 +104,7 @@ public class XmppPeerRepository .orderBy(PeerModel.ADDRESS) .get().observableResult() .map(ResultDelegate::toList) - .map(this::peerModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::peerModelsToEntities); } private List peerModelsToEntities(List peerModels) { @@ -141,9 +122,7 @@ public class XmppPeerRepository //.and(isContact()) .get().observableResult() .map(ResultDelegate::toList) - .map(this::peerModelsToEntities) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(this::peerModelsToEntities); } @Override @@ -155,9 +134,7 @@ public class XmppPeerRepository // write changes into model .map(model -> peerMapping.toModel(peer, model)) .flatMap(data()::update) - .map(model -> peerMapping.toEntity(model, peer)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> peerMapping.toEntity(model, peer)); } @Override @@ -173,18 +150,14 @@ public class XmppPeerRepository .map(model -> peerMapping.toModel(peer, model)) // write changed model back to db .flatMap(data()::update) - .map(model -> peerMapping.toEntity(model, peer)) - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .map(model -> peerMapping.toEntity(model, peer)); } @Override public Completable deletePeer(Peer peer) { return data().delete(PeerModel.class) .where(PeerModel.ID.eq(peer.getId())) - .get().single().ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .get().single().ignoreElement(); } @Override @@ -192,17 +165,13 @@ public class XmppPeerRepository return data().delete(PeerModel.class) .where(PeerModel.ACCOUNT_ID.eq(accountId) .and(PeerModel.ADDRESS.eq(address))) - .get().single().ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .get().single().ignoreElement(); } @Override public Completable deleteAllPeers(UUID accountId) { return data().delete(PeerModel.class) .where(PeerModel.ACCOUNT_ID.eq(accountId)) - .get().single().ignoreElement() - .subscribeOn(subscriberScheduler()) - .observeOn(observerScheduler()); + .get().single().ignoreElement(); } } diff --git a/data/src/test/java/org/mercury_im/messenger/data/di/InMemoryDatabaseComponent.java b/data/src/test/java/org/mercury_im/messenger/data/di/component/InMemoryDatabaseComponent.java similarity index 59% rename from data/src/test/java/org/mercury_im/messenger/data/di/InMemoryDatabaseComponent.java rename to data/src/test/java/org/mercury_im/messenger/data/di/component/InMemoryDatabaseComponent.java index 37e71d6..a90ca29 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/di/InMemoryDatabaseComponent.java +++ b/data/src/test/java/org/mercury_im/messenger/data/di/component/InMemoryDatabaseComponent.java @@ -1,5 +1,8 @@ -package org.mercury_im.messenger.data.di; +package org.mercury_im.messenger.data.di.component; +import org.mercury_im.messenger.data.di.RepositoryModule; +import org.mercury_im.messenger.data.di.module.TestDatabaseModule; +import org.mercury_im.messenger.data.di.module.TestingSchedulerModule; import org.mercury_im.messenger.data.repository.AccountRepositoryTest; import javax.inject.Singleton; diff --git a/data/src/test/java/org/mercury_im/messenger/data/di/MappingTestComponent.java b/data/src/test/java/org/mercury_im/messenger/data/di/component/MappingTestComponent.java similarity index 81% rename from data/src/test/java/org/mercury_im/messenger/data/di/MappingTestComponent.java rename to data/src/test/java/org/mercury_im/messenger/data/di/component/MappingTestComponent.java index 6c8ff56..842f39d 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/di/MappingTestComponent.java +++ b/data/src/test/java/org/mercury_im/messenger/data/di/component/MappingTestComponent.java @@ -1,6 +1,7 @@ -package org.mercury_im.messenger.data.di; +package org.mercury_im.messenger.data.di.component; +import org.mercury_im.messenger.data.di.MappingModule; import org.mercury_im.messenger.data.mapping.AccountMappingTest; import org.mercury_im.messenger.data.mapping.EntityCapsMappingTest; import org.mercury_im.messenger.data.mapping.PeerMappingTest; diff --git a/data/src/test/java/org/mercury_im/messenger/data/di/TestDatabaseModule.java b/data/src/test/java/org/mercury_im/messenger/data/di/module/TestDatabaseModule.java similarity index 97% rename from data/src/test/java/org/mercury_im/messenger/data/di/TestDatabaseModule.java rename to data/src/test/java/org/mercury_im/messenger/data/di/module/TestDatabaseModule.java index e16e621..c7f7ca2 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/di/TestDatabaseModule.java +++ b/data/src/test/java/org/mercury_im/messenger/data/di/module/TestDatabaseModule.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.data.di; +package org.mercury_im.messenger.data.di.module; import org.mercury_im.messenger.data.model.Models; import org.sqlite.SQLiteConfig; diff --git a/data/src/test/java/org/mercury_im/messenger/data/di/TestingSchedulerModule.java b/data/src/test/java/org/mercury_im/messenger/data/di/module/TestingSchedulerModule.java similarity index 70% rename from data/src/test/java/org/mercury_im/messenger/data/di/TestingSchedulerModule.java rename to data/src/test/java/org/mercury_im/messenger/data/di/module/TestingSchedulerModule.java index a96ffc1..56a052e 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/di/TestingSchedulerModule.java +++ b/data/src/test/java/org/mercury_im/messenger/data/di/module/TestingSchedulerModule.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.data.di; +package org.mercury_im.messenger.data.di.module; -import org.mercury_im.messenger.core.util.ThreadUtils; +import org.mercury_im.messenger.core.SchedulersFacade; import javax.inject.Named; import javax.inject.Singleton; @@ -15,14 +15,14 @@ public class TestingSchedulerModule { @Provides @Singleton - @Named(value = ThreadUtils.SCHEDULER_IO) + @Named(value = SchedulersFacade.SCHEDULER_IO) public static Scheduler provideSubscriberScheduler() { return Schedulers.io(); } @Provides @Singleton - @Named(value = ThreadUtils.SCHEDULER_UI) + @Named(value = SchedulersFacade.SCHEDULER_UI) public static Scheduler provideObserverScheduler() { return Schedulers.trampoline(); } diff --git a/data/src/test/java/org/mercury_im/messenger/data/mapping/AccountMappingTest.java b/data/src/test/java/org/mercury_im/messenger/data/mapping/AccountMappingTest.java index 105c45c..b2b3413 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/mapping/AccountMappingTest.java +++ b/data/src/test/java/org/mercury_im/messenger/data/mapping/AccountMappingTest.java @@ -1,14 +1,13 @@ package org.mercury_im.messenger.data.mapping; import org.junit.Test; -import org.mercury_im.messenger.data.di.DaggerMappingTestComponent; +import org.mercury_im.messenger.data.di.component.DaggerMappingTestComponent; import org.mercury_im.messenger.data.model.AccountModel; import org.mercury_im.messenger.entity.Account; import javax.inject.Inject; import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertNotSame; public class AccountMappingTest { @@ -19,12 +18,12 @@ public class AccountMappingTest { public static final Account ACCOUNT_LITTLE_JOE; static { - ACCOUNT_MISSION_CONTROL = new IAccount(); + ACCOUNT_MISSION_CONTROL = new Account(); ACCOUNT_MISSION_CONTROL.setAddress("mission-controll@planet.earth"); ACCOUNT_MISSION_CONTROL.setEnabled(true); ACCOUNT_MISSION_CONTROL.setPassword("notBecauseTheyAreEasy"); - ACCOUNT_LITTLE_JOE = new IAccount(); + ACCOUNT_LITTLE_JOE = new Account(); ACCOUNT_LITTLE_JOE.setAddress("little-joe@planet.earth"); ACCOUNT_LITTLE_JOE.setEnabled(false); ACCOUNT_LITTLE_JOE.setPassword("butBecauseTheyAreHard"); diff --git a/data/src/test/java/org/mercury_im/messenger/data/mapping/EntityCapsMappingTest.java b/data/src/test/java/org/mercury_im/messenger/data/mapping/EntityCapsMappingTest.java index c4697d9..a84dee5 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/mapping/EntityCapsMappingTest.java +++ b/data/src/test/java/org/mercury_im/messenger/data/mapping/EntityCapsMappingTest.java @@ -1,7 +1,7 @@ package org.mercury_im.messenger.data.mapping; import org.junit.Test; -import org.mercury_im.messenger.data.di.DaggerMappingTestComponent; +import org.mercury_im.messenger.data.di.component.DaggerMappingTestComponent; import org.mercury_im.messenger.data.model.EntityCapsModel; import org.mercury_im.messenger.entity.caps.EntityCapsRecord; @@ -20,7 +20,7 @@ public class EntityCapsMappingTest { @Test public void mapEntityToModelTest() { - EntityCapsRecord entity = new IEntityCapsRecord(); + EntityCapsRecord entity = new EntityCapsRecord(); entity.setNodeVer("thisisahash"); entity.setXml(""); diff --git a/data/src/test/java/org/mercury_im/messenger/data/mapping/PeerMappingTest.java b/data/src/test/java/org/mercury_im/messenger/data/mapping/PeerMappingTest.java index 78a271c..c5ed545 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/mapping/PeerMappingTest.java +++ b/data/src/test/java/org/mercury_im/messenger/data/mapping/PeerMappingTest.java @@ -1,7 +1,7 @@ package org.mercury_im.messenger.data.mapping; import org.junit.Test; -import org.mercury_im.messenger.data.di.DaggerMappingTestComponent; +import org.mercury_im.messenger.data.di.component.DaggerMappingTestComponent; import org.mercury_im.messenger.data.model.AccountModel; import org.mercury_im.messenger.data.model.PeerModel; import org.mercury_im.messenger.entity.contact.Peer; @@ -19,7 +19,7 @@ public class PeerMappingTest { public static final Peer PEER_GORDO; static { - PEER_GORDO = new IPeer(); + PEER_GORDO = new Peer(); PEER_GORDO.setAccount(AccountMappingTest.ACCOUNT_MISSION_CONTROL); PEER_GORDO.setAddress("gordo@big.joe"); PEER_GORDO.setName("Gordo"); diff --git a/data/src/test/java/org/mercury_im/messenger/data/repository/AccountRepositoryTest.java b/data/src/test/java/org/mercury_im/messenger/data/repository/AccountRepositoryTest.java index 38b69eb..6b8aad6 100644 --- a/data/src/test/java/org/mercury_im/messenger/data/repository/AccountRepositoryTest.java +++ b/data/src/test/java/org/mercury_im/messenger/data/repository/AccountRepositoryTest.java @@ -1,8 +1,8 @@ package org.mercury_im.messenger.data.repository; import org.junit.Test; -import org.mercury_im.messenger.data.di.DaggerInMemoryDatabaseComponent; -import org.mercury_im.messenger.data.di.InMemoryDatabaseComponent; +import org.mercury_im.messenger.data.di.component.DaggerInMemoryDatabaseComponent; +import org.mercury_im.messenger.data.di.component.InMemoryDatabaseComponent; import org.mercury_im.messenger.entity.Account; import java.util.NoSuchElementException; @@ -24,16 +24,16 @@ public class AccountRepositoryTest { ReactiveEntityStore dataStore; @Inject - XmppAccountRepository accountRepository; + RxAccountRepository accountRepository; @Inject - XmppDirectChatRepository directChatRepository; + RxDirectChatRepository directChatRepository; @Inject - XmppPeerRepository contactRepository; + RxPeerRepository contactRepository; @Inject - XmppMessageRepository messageRepository; + RxMessageRepository messageRepository; @Inject public AccountRepositoryTest() { @@ -51,7 +51,7 @@ public class AccountRepositoryTest { Thread.sleep(100); - Account a1 = new IAccount(); + Account a1 = new Account(); a1.setAddress("a1@example.com"); a1.setPassword("a1a1a1"); a1.setEnabled(true); @@ -60,7 +60,7 @@ public class AccountRepositoryTest { Thread.sleep(100); - Account a2 = new IAccount(); + Account a2 = new Account(); a2.setAddress("a2@example.com"); a2.setPassword("a2a2a2"); a2.setEnabled(false); @@ -69,7 +69,7 @@ public class AccountRepositoryTest { Thread.sleep(100); - Account a3 = new IAccount(); + Account a3 = new Account(); a3.setAddress("a3@example.com"); a3.setPassword("a3a3a3"); a3.setEnabled(false); @@ -100,7 +100,8 @@ public class AccountRepositoryTest { } })); - Account account = new IAccount(uuid); + Account account = new Account(); + account.setId(uuid); account.setEnabled(true); account.setAddress("hello@world"); account.setPassword("wooooooh"); @@ -120,7 +121,7 @@ public class AccountRepositoryTest { @Test(expected = NoSuchElementException.class) public void updateMissingEntityFails() { - Account missingAccount = new IAccount(); + Account missingAccount = new Account(); missingAccount.setAddress("this@account.is.missing"); missingAccount.setPassword("inTheDatabase");