Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Construct EventBusImpl by injection.

Browse Source
This commit is contained in:
akwizgran
2019-04-05 15:19:31 +01:00
parent c3b5b04b71
commit 0d0197fd2d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java
View File

@@ -2,6 +2,7 @@ package org.briarproject.bramble.event;
import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.event.EventExecutor;
import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.event.EventListener;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -10,6 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
import javax.inject.Inject;
@ThreadSafe @ThreadSafe
@NotNullByDefault @NotNullByDefault
@@ -19,7 +21,8 @@ class EventBusImpl implements EventBus {
new CopyOnWriteArrayList<>(); new CopyOnWriteArrayList<>();
private final Executor eventExecutor; private final Executor eventExecutor;
EventBusImpl(Executor eventExecutor) { @Inject
EventBusImpl(@EventExecutor Executor eventExecutor) {
this.eventExecutor = eventExecutor; this.eventExecutor = eventExecutor;
} }

7
bramble-core/src/main/java/org/briarproject/bramble/event/EventModule.java
View File

@@ -1,9 +1,6 @@
package org.briarproject.bramble.event; package org.briarproject.bramble.event;
import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.event.EventExecutor;
import java.util.concurrent.Executor;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -15,7 +12,7 @@ public class EventModule {
@Provides @Provides
@Singleton @Singleton
EventBus provideEventBus(@EventExecutor Executor eventExecutor) { EventBus provideEventBus(EventBusImpl eventBus) {
return new EventBusImpl(eventExecutor); return eventBus;
} }
} }

2
briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt
View File

@@ -4,6 +4,7 @@ import dagger.Component
import org.briarproject.bramble.BrambleCoreEagerSingletons import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.bramble.BrambleCoreModule import org.briarproject.bramble.BrambleCoreModule
import org.briarproject.bramble.account.AccountModule import org.briarproject.bramble.account.AccountModule
import org.briarproject.bramble.event.DefaultEventExecutorModule
import org.briarproject.bramble.test.TestSecureRandomModule import org.briarproject.bramble.test.TestSecureRandomModule
import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.BriarCoreEagerSingletons
import org.briarproject.briar.BriarCoreModule import org.briarproject.briar.BriarCoreModule
@@ -16,6 +17,7 @@ import javax.inject.Singleton
BriarCoreModule::class, BriarCoreModule::class,
TestSecureRandomModule::class, TestSecureRandomModule::class,
AccountModule::class, AccountModule::class,
DefaultEventExecutorModule::class,
HeadlessTestModule::class HeadlessTestModule::class
] ]
) )