Finishing touches on this branch

A248 · Sep 12, 2023 · 5a2573b · 5a2573b
1 parent 10b4ae5
commit 5a2573b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/...s/addon-integration/src/test/java/space/arim/libertybans/core/addon/it/AddonITModule.java b/...s/addon-integration/src/test/java/space/arim/libertybans/core/addon/it/AddonITModule.java
@@ -20,6 +20,8 @@
 package space.arim.libertybans.core.addon.it;
 
 import jakarta.inject.Singleton;
+import space.arim.libertybans.core.env.EnvMessageChannel;
+import space.arim.libertybans.core.env.EnvServerNameDetection;
 import space.arim.libertybans.core.importing.PlatformImportSource;
 import space.arim.libertybans.core.selector.cache.MuteCache;
 import space.arim.libertybans.core.selector.cache.OnDemandMuteCache;
@@ -37,6 +39,14 @@ public MuteCache muteCache(OnDemandMuteCache muteCache) {
 		return muteCache;
 	}
 
+	public EnvMessageChannel<?> messageChannel(EnvMessageChannel.NoOp messageChannel) {
+		return messageChannel;
+	}
+
+	public EnvServerNameDetection serverNameDetection() {
+		return (scopeManager) -> {};
+	}
+
 	public PlatformImportSource platformImportSource() {
 		throw new UnsupportedOperationException("PlatformImportSource not available");
 	}

diff --git a/...addons/addon-integration/src/test/java/space/arim/libertybans/core/addon/it/AddonsIT.java b/...addons/addon-integration/src/test/java/space/arim/libertybans/core/addon/it/AddonsIT.java
@@ -43,6 +43,7 @@
 import space.arim.libertybans.core.env.EnvEnforcer;
 import space.arim.libertybans.core.env.EnvUserResolver;
 import space.arim.libertybans.core.env.Environment;
+import space.arim.libertybans.core.env.InstanceType;
 import space.arim.libertybans.core.env.PlatformListener;
 import space.arim.omnibus.util.concurrent.impl.IndifferentFactoryOfTheFuture;
 import space.arim.omnibus.util.concurrent.impl.SimplifiedEnhancedExecutor;
@@ -87,6 +88,7 @@ public void execute(Runnable command) {
 		this.injector = new InjectorBuilder()
 				.bindInstance(Server.class, server)
 				.bindInstance(Identifier.ofTypeAndNamed(Path.class, "folder"), folder)
+				.bindInstance(InstanceType.class, InstanceType.STANDALONE)
 				.bindInstance(PlatformHandle.class, handle)
 				.bindInstance(Environment.class, environment)
 				.bindInstance(EnvEnforcer.class, envEnforcer)

diff --git a/...t/jpms-compat/src/main/java/space/arim/libertybans/core/it/jpmscompat/JpmsBindModule.java b/...t/jpms-compat/src/main/java/space/arim/libertybans/core/it/jpmscompat/JpmsBindModule.java
@@ -1,6 +1,6 @@
 /*
  * LibertyBans
- * Copyright © 2021 Anand Beh
+ * Copyright © 2023 Anand Beh
  *
  * LibertyBans is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,6 +19,7 @@
 
 package space.arim.libertybans.core.it.jpmscompat;
 
+import space.arim.libertybans.core.env.EnvMessageChannel;
 import space.arim.libertybans.core.selector.cache.MuteCache;
 import space.arim.libertybans.core.selector.cache.OnDemandMuteCache;
 import space.arim.libertybans.core.importing.PlatformImportSource;
@@ -29,6 +30,10 @@ public MuteCache muteCache(OnDemandMuteCache muteCache) {
 		return muteCache;
 	}
 
+	public EnvMessageChannel<?> messageChannel(EnvMessageChannel.NoOp messageChannel) {
+		return messageChannel;
+	}
+
 	public PlatformImportSource platformImportSource() {
 		throw new UnsupportedOperationException("PlatformImportSource not available");
 	}

diff --git a/.../it/jpms-compat/src/main/java/space/arim/libertybans/core/it/jpmscompat/JpmsLauncher.java b/.../it/jpms-compat/src/main/java/space/arim/libertybans/core/it/jpmscompat/JpmsLauncher.java
@@ -1,6 +1,6 @@
 /*
  * LibertyBans
- * Copyright © 2021 Anand Beh
+ * Copyright © 2023 Anand Beh
  *
  * LibertyBans is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -28,8 +28,10 @@
 import space.arim.libertybans.core.PillarOneBindModule;
 import space.arim.libertybans.core.PillarTwoBindModule;
 import space.arim.libertybans.core.env.EnvEnforcer;
+import space.arim.libertybans.core.env.EnvServerNameDetection;
 import space.arim.libertybans.core.env.EnvUserResolver;
 import space.arim.libertybans.core.env.Environment;
+import space.arim.libertybans.core.env.InstanceType;
 import space.arim.omnibus.DefaultOmnibus;
 import space.arim.omnibus.Omnibus;
 
@@ -56,11 +58,13 @@ public JpmsLauncher(Path folder, PlatformHandle handle, Environment environment,
 	public BaseFoundation launch() {
 		return new InjectorBuilder()
 				.bindInstance(Identifier.ofTypeAndNamed(Path.class, "folder"), folder)
+				.bindInstance(InstanceType.class, InstanceType.STANDALONE)
 				.bindInstance(Omnibus.class, new DefaultOmnibus())
 				.bindInstance(PlatformHandle.class, handle)
 				.bindInstance(Environment.class, environment)
 				.bindInstance(EnvEnforcer.class, envEnforcer)
 				.bindInstance(EnvUserResolver.class, envUserResolver)
+				.bindInstance(EnvServerNameDetection.class, (scopeManager) -> {})
 				.addBindModules(
 						new ApiBindModule(),
 						new PillarOneBindModule(),