Use default methods for easier maintenance.

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java

@@ -35,4 +35,18 @@ public interface BrambleCoreEagerSingletons {
 	void inject(ValidationModule.EagerSingletons init);
 
 	void inject(VersioningModule.EagerSingletons init);
+
+	default void injectBrambleCoreEagerSingletons() {
+		inject(new ContactModule.EagerSingletons());
+		inject(new CryptoExecutorModule.EagerSingletons());
+		inject(new DatabaseExecutorModule.EagerSingletons());
+		inject(new IdentityModule.EagerSingletons());
+		inject(new LifecycleModule.EagerSingletons());
+		inject(new PluginModule.EagerSingletons());
+		inject(new PropertiesModule.EagerSingletons());
+		inject(new SystemModule.EagerSingletons());
+		inject(new TransportModule.EagerSingletons());
+		inject(new ValidationModule.EagerSingletons());
+		inject(new VersioningModule.EagerSingletons());
+	}
 }

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java

@@ -52,16 +52,6 @@ import dagger.Module;
 public class BrambleCoreModule {
 
 	public static void initEagerSingletons(BrambleCoreEagerSingletons c) {
-		c.inject(new ContactModule.EagerSingletons());
+		c.injectBrambleCoreEagerSingletons();
-		c.inject(new CryptoExecutorModule.EagerSingletons());
-		c.inject(new DatabaseExecutorModule.EagerSingletons());
-		c.inject(new IdentityModule.EagerSingletons());
-		c.inject(new LifecycleModule.EagerSingletons());
-		c.inject(new PluginModule.EagerSingletons());
-		c.inject(new PropertiesModule.EagerSingletons());
-		c.inject(new SystemModule.EagerSingletons());
-		c.inject(new TransportModule.EagerSingletons());
-		c.inject(new ValidationModule.EagerSingletons());
-		c.inject(new VersioningModule.EagerSingletons());
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.sync;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.TransportCrypto;
@@ -73,7 +72,7 @@ public class SyncIntegrationTest extends BrambleTestCase {
 
 		SyncIntegrationTestComponent component =
 				DaggerSyncIntegrationTestComponent.builder().build();
-		BrambleCoreModule.initEagerSingletons(component);
+		component.injectBrambleCoreEagerSingletons();
 		component.inject(this);
 
 		contactId = getContactId();

bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.plugin.tor;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
@@ -46,7 +45,7 @@ public class BridgeTest extends BrambleTestCase {
 	public static Iterable<String> data() {
 		BrambleJavaIntegrationTestComponent component =
 				DaggerBrambleJavaIntegrationTestComponent.builder().build();
-		BrambleCoreModule.initEagerSingletons(component);
+		component.injectBrambleCoreEagerSingletons();
 		return component.getCircumventionProvider().getBridges(false);
 	}
 
@@ -91,7 +90,7 @@ public class BridgeTest extends BrambleTestCase {
 
 		BrambleJavaIntegrationTestComponent component =
 				DaggerBrambleJavaIntegrationTestComponent.builder().build();
-		BrambleCoreModule.initEagerSingletons(component);
+		component.injectBrambleCoreEagerSingletons();
 		component.inject(this);
 
 		LocationUtils locationUtils = () -> "US";

briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java

@@ -65,23 +65,23 @@ public class BlogManagerIntegrationTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	@Test

briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.feed;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.identity.Identity;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
@@ -11,7 +10,6 @@ import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPostHeader;
 import org.briarproject.briar.api.feed.Feed;
 import org.briarproject.briar.api.feed.FeedManager;
-import org.briarproject.briar.blog.BlogModule;
 import org.briarproject.briar.test.BriarTestCase;
 import org.junit.After;
 import org.junit.Before;
@@ -40,7 +38,7 @@ public class FeedManagerIntegrationTest extends BriarTestCase {
 				DaggerFeedManagerIntegrationTestComponent.builder()
 						.testDatabaseConfigModule(
 								new TestDatabaseConfigModule(testFile)).build();
-		injectEagerSingletons(component);
+		component.injectFeedManagerEagerSingletons();
 		component.inject(this);
 
 		IdentityManager identityManager = component.getIdentityManager();
@@ -111,12 +109,4 @@ public class FeedManagerIntegrationTest extends BriarTestCase {
 		lifecycleManager.waitForShutdown();
 		TestUtils.deleteTestDirectory(testDir);
 	}
-
-	protected void injectEagerSingletons(
-			FeedManagerIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new FeedModule.EagerSingletons());
-	}
-
 }

briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java

@@ -35,6 +35,12 @@ interface FeedManagerIntegrationTestComponent
 
 	void inject(FeedModule.EagerSingletons init);
 
+	default void injectFeedManagerEagerSingletons() {
+		injectBrambleCoreEagerSingletons();
+		inject(new BlogModule.EagerSingletons());
+		inject(new FeedModule.EagerSingletons());
+	}
+
 	IdentityManager getIdentityManager();
 
 	LifecycleManager getLifecycleManager();

briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java

@@ -56,23 +56,23 @@ public class ForumManagerTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	private ForumPost createForumPost(GroupId groupId,

briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.introduction;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
@@ -12,12 +11,6 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.briar.api.client.SessionId;
-import org.briarproject.briar.blog.BlogModule;
-import org.briarproject.briar.forum.ForumModule;
-import org.briarproject.briar.messaging.MessagingModule;
-import org.briarproject.briar.privategroup.PrivateGroupModule;
-import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
-import org.briarproject.briar.sharing.SharingModule;
 import org.junit.Test;
 
 import java.util.Map;
@@ -61,7 +54,7 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase {
 	public IntroductionCryptoIntegrationTest() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 		crypto = new IntroductionCryptoImpl(cryptoComponent, clientHelper);
 
@@ -156,16 +149,4 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase {
 		byte[] bobMac = crypto.activateMac(bobMacKey);
 		crypto.verifyActivateMac(bobMac, bobMacKey);
 	}
-
-	private static void injectEagerSingletons(
-			IntroductionIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new ForumModule.EagerSingletons());
-		component.inject(new GroupInvitationModule.EagerSingletons());
-		component.inject(new IntroductionModule.EagerSingletons());
-		component.inject(new MessagingModule.EagerSingletons());
-		component.inject(new PrivateGroupModule.EagerSingletons());
-		component.inject(new SharingModule.EagerSingletons());
-	}
 }

briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java

@@ -106,23 +106,23 @@ public class IntroductionIntegrationTest
 	protected void createComponents() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerIntroductionIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerIntroductionIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerIntroductionIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	@Test

briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.introduction;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.PublicKey;
@@ -18,12 +17,6 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.briar.api.client.SessionId;
-import org.briarproject.briar.blog.BlogModule;
-import org.briarproject.briar.forum.ForumModule;
-import org.briarproject.briar.messaging.MessagingModule;
-import org.briarproject.briar.privategroup.PrivateGroupModule;
-import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
-import org.briarproject.briar.sharing.SharingModule;
 import org.junit.Test;
 
 import java.util.Map;
@@ -81,7 +74,7 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase {
 	public MessageEncoderParserIntegrationTest() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		messageEncoder = new MessageEncoderImpl(clientHelper, messageFactory);
@@ -253,16 +246,4 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase {
 		assertEquals(previousMsgId, am.getPreviousMessageId());
 		assertEquals(sessionId, am.getSessionId());
 	}
-
-	private static void injectEagerSingletons(
-			IntroductionIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new ForumModule.EagerSingletons());
-		component.inject(new GroupInvitationModule.EagerSingletons());
-		component.inject(new IntroductionModule.EagerSingletons());
-		component.inject(new MessagingModule.EagerSingletons());
-		component.inject(new PrivateGroupModule.EagerSingletons());
-		component.inject(new SharingModule.EagerSingletons());
-	}
 }

briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.introduction;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.PrivateKey;
@@ -16,13 +15,7 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.briar.api.client.SessionId;
-import org.briarproject.briar.blog.BlogModule;
-import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.introduction.IntroducerSession.Introducee;
-import org.briarproject.briar.messaging.MessagingModule;
-import org.briarproject.briar.privategroup.PrivateGroupModule;
-import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
-import org.briarproject.briar.sharing.SharingModule;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -90,7 +83,7 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase {
 	public SessionEncoderParserIntegrationTest() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		sessionEncoder = new SessionEncoderImpl(clientHelper);
@@ -346,16 +339,4 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase {
 		assertEquals(i1.lastLocalMessageId, i2.lastLocalMessageId);
 		assertEquals(i1.lastRemoteMessageId, i2.lastRemoteMessageId);
 	}
-
-	private static void injectEagerSingletons(
-			IntroductionIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new ForumModule.EagerSingletons());
-		component.inject(new GroupInvitationModule.EagerSingletons());
-		component.inject(new IntroductionModule.EagerSingletons());
-		component.inject(new MessagingModule.EagerSingletons());
-		component.inject(new PrivateGroupModule.EagerSingletons());
-		component.inject(new SharingModule.EagerSingletons());
-	}
 }

briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.messaging;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.identity.AuthorFactory;
@@ -11,7 +10,6 @@ import org.briarproject.briar.api.forum.ForumPost;
 import org.briarproject.briar.api.forum.ForumPostFactory;
 import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
-import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.test.BriarTestCase;
 import org.junit.Test;
 
@@ -41,7 +39,7 @@ public class MessageSizeIntegrationTest extends BriarTestCase {
 	public MessageSizeIntegrationTest() {
 		MessageSizeIntegrationTestComponent component =
 				DaggerMessageSizeIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectMessageSizeEagerSingletons();
 		component.inject(this);
 	}
 
@@ -79,11 +77,4 @@ public class MessageSizeIntegrationTest extends BriarTestCase {
 				+ MAX_FORUM_POST_TEXT_LENGTH);
 		assertTrue(length <= MAX_RECORD_PAYLOAD_BYTES);
 	}
-
-	private static void injectEagerSingletons(
-			MessageSizeIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new ForumModule.EagerSingletons());
-		component.inject(new MessagingModule.EagerSingletons());
-	}
 }

briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java

@@ -26,4 +26,10 @@ interface MessageSizeIntegrationTestComponent
 	void inject(ForumModule.EagerSingletons init);
 
 	void inject(MessagingModule.EagerSingletons init);
+
+	default void injectMessageSizeEagerSingletons() {
+		injectBrambleCoreEagerSingletons();
+		inject(new ForumModule.EagerSingletons());
+		inject(new MessagingModule.EagerSingletons());
+	}
 }

briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.messaging;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.SecretKey;
@@ -67,11 +66,11 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		alice = DaggerSimplexMessagingIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(
 						new TestDatabaseConfigModule(aliceDir)).build();
-		injectEagerSingletons(alice);
+		alice.injectSimplexMessagingEagerSingletons();
 		bob = DaggerSimplexMessagingIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(bobDir))
 				.build();
-		injectEagerSingletons(bob);
+		bob.injectSimplexMessagingEagerSingletons();
 	}
 
 	@Test
@@ -200,12 +199,6 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		deleteTestDirectory(testDir);
 	}
 
-	private static void injectEagerSingletons(
-			SimplexMessagingIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new MessagingModule.EagerSingletons());
-	}
-
 	@NotNullByDefault
 	private static class MessageDeliveryListener implements EventListener {
 

briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java

@@ -31,6 +31,11 @@ interface SimplexMessagingIntegrationTestComponent
 
 	void inject(MessagingModule.EagerSingletons init);
 
+	default void injectSimplexMessagingEagerSingletons() {
+		injectBrambleCoreEagerSingletons();
+		inject(new MessagingModule.EagerSingletons());
+	}
+
 	LifecycleManager getLifecycleManager();
 
 	IdentityManager getIdentityManager();

briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java

@@ -70,23 +70,23 @@ public class PrivateGroupIntegrationTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	@Test

briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java

@@ -59,23 +59,23 @@ public class PrivateGroupManagerIntegrationTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	@Test

briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java

@@ -58,23 +58,23 @@ public class GroupInvitationIntegrationTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	@Test

briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java

@@ -82,23 +82,23 @@ public class BlogSharingIntegrationTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	@Test

briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java

@@ -86,23 +86,23 @@ public class ForumSharingIntegrationTest
 	protected void createComponents() {
 		BriarIntegrationTestComponent component =
 				DaggerBriarIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		component.injectBriarEagerSingletons();
 		component.inject(this);
 
 		c0 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir))
 				.build();
-		injectEagerSingletons(c0);
+		c0.injectBriarEagerSingletons();
 
 		c1 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir))
 				.build();
-		injectEagerSingletons(c1);
+		c1.injectBriarEagerSingletons();
 
 		c2 = DaggerBriarIntegrationTestComponent.builder()
 				.testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir))
 				.build();
-		injectEagerSingletons(c2);
+		c2.injectBriarEagerSingletons();
 	}
 
 	private void addForumForSharer() throws DbException {

briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.test;
 
 import net.jodah.concurrentunit.Waiter;
 
-import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.client.ContactGroupFactory;
@@ -38,13 +37,6 @@ import org.briarproject.briar.api.forum.ForumPostFactory;
 import org.briarproject.briar.api.privategroup.GroupMessageFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory;
-import org.briarproject.briar.blog.BlogModule;
-import org.briarproject.briar.forum.ForumModule;
-import org.briarproject.briar.introduction.IntroductionModule;
-import org.briarproject.briar.messaging.MessagingModule;
-import org.briarproject.briar.privategroup.PrivateGroupModule;
-import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
-import org.briarproject.briar.sharing.SharingModule;
 import org.junit.After;
 import org.junit.Before;
 
@@ -175,18 +167,6 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 
 	abstract protected void createComponents();
 
-	protected void injectEagerSingletons(
-			BriarIntegrationTestComponent component) {
-		BrambleCoreModule.initEagerSingletons(component);
-		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new ForumModule.EagerSingletons());
-		component.inject(new GroupInvitationModule.EagerSingletons());
-		component.inject(new IntroductionModule.EagerSingletons());
-		component.inject(new MessagingModule.EagerSingletons());
-		component.inject(new PrivateGroupModule.EagerSingletons());
-		component.inject(new SharingModule.EagerSingletons());
-	}
-
 	private void startLifecycles() throws InterruptedException {
 		// Start the lifecycle manager and wait for it to finish starting
 		lifecycleManager0 = c0.getLifecycleManager();

briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java

@@ -66,6 +66,17 @@ public interface BriarIntegrationTestComponent
 
 	void inject(SharingModule.EagerSingletons init);
 
+	default void injectBriarEagerSingletons() {
+		injectBrambleCoreEagerSingletons();
+		inject(new BlogModule.EagerSingletons());
+		inject(new ForumModule.EagerSingletons());
+		inject(new GroupInvitationModule.EagerSingletons());
+		inject(new IntroductionModule.EagerSingletons());
+		inject(new MessagingModule.EagerSingletons());
+		inject(new PrivateGroupModule.EagerSingletons());
+		inject(new SharingModule.EagerSingletons());
+	}
+
 	LifecycleManager getLifecycleManager();
 
 	EventBus getEventBus();

briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt

@@ -21,6 +21,7 @@ import javax.inject.Singleton
 )
 @Singleton
 internal interface BriarHeadlessApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
+
     fun getRouter(): Router
 
     fun getSecureRandom(): SecureRandom

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

@@ -24,6 +24,7 @@ import javax.inject.Singleton
 )
 @Singleton
 internal interface BriarHeadlessTestApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
+
     fun getRouter(): Router
 
     fun getCryptoComponent(): CryptoComponent