Clean up guice modules

Author: alexstaeding

anvil-api/src/main/java/org/anvilpowered/anvil/api/Anvil.java

@@ -19,13 +19,11 @@
 package org.anvilpowered.anvil.api;
 
 import com.google.common.base.Preconditions;
-import com.google.inject.Binder;
 import com.google.inject.Binding;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import org.anvilpowered.anvil.api.coremember.CoreMemberManager;
 import org.anvilpowered.anvil.api.coremember.CoreMemberRepository;
-import org.anvilpowered.anvil.api.misc.BindingExtensions;
 import org.anvilpowered.anvil.api.registry.Registry;
 import org.anvilpowered.anvil.base.plugin.BasePlugin;
 
@@ -44,10 +42,6 @@ public class Anvil extends BasePlugin {
         super(name, rootInjector, module);
     }
 
-    public static BindingExtensions getBindingExtensions(Binder binder) {
-        return getServiceManager().provide(BindingExtensions.class, binder);
-    }
-
     public static Environment.Builder getEnvironmentBuilder() {
         return getServiceManager().provide(Environment.Builder.class);
     }

anvil-api/src/main/java/org/anvilpowered/anvil/api/datastore/DBComponent.java

@@ -18,8 +18,6 @@
 
 package org.anvilpowered.anvil.api.datastore;
 
-import org.anvilpowered.anvil.api.misc.BindingExtensions;
-
 import java.util.Optional;
 
 /**
@@ -28,7 +26,6 @@
  * @see Manager
  * @see Repository
  * @see CacheService
- * @see BindingExtensions
  */
 public interface DBComponent<
     TKey,

anvil-api/src/main/java/org/anvilpowered/anvil/api/datastore/Manager.java

@@ -20,7 +20,6 @@
 
 import com.google.inject.name.Named;
 import net.kyori.adventure.text.Component;
-import org.anvilpowered.anvil.api.misc.BindingExtensions;
 import org.anvilpowered.anvil.api.registry.Keys;
 import org.anvilpowered.anvil.api.registry.Registry;
 import org.anvilpowered.anvil.api.util.TextService;
@@ -109,14 +108,10 @@ public interface Manager<C extends DBComponent<?, ?>> {
      * For example, 'mongodb' (or any capitalization thereof) will match
      * a {@link DBComponent} annotated with {@link Named}{@code (value = "mongodb")}
      * </p>
-     * <p>
-     * Use {@link BindingExtensions} to bind your component implementations
-     * </p>
      *
      * @return The current {@link DBComponent} implementation
      * @throws IllegalStateException If the config has not been loaded yet, or if no implementation was found
      * @see DBComponent
-     * @see BindingExtensions
      */
     C getPrimaryComponent();
 }

anvil-api/src/main/java/org/anvilpowered/anvil/api/misc/BindingExtensions.java

@@ -0,0 +1,56 @@
+/*
+ *   Anvil - AnvilPowered
+ *   Copyright (C) 2020-2021
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Lesser General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.anvilpowered.anvil.api.misc
+
+import com.google.common.reflect.TypeToken
+import com.google.inject.Binder
+import com.google.inject.Key
+import com.google.inject.TypeLiteral
+import com.google.inject.binder.AnnotatedBindingBuilder
+import com.google.inject.binder.LinkedBindingBuilder
+import com.google.inject.binder.ScopedBindingBuilder
+import dev.morphia.Datastore
+import jetbrains.exodus.entitystore.EntityId
+import jetbrains.exodus.entitystore.PersistentEntityStore
+import org.anvilpowered.anvil.api.Anvil
+import org.anvilpowered.anvil.api.datastore.DataStoreContext
+import org.anvilpowered.anvil.api.datastore.MongoContext
+import org.anvilpowered.anvil.api.datastore.XodusContext
+import org.bson.types.ObjectId
+
+inline fun <reified T> Binder.bind(declaring: Any? = null): AnnotatedBindingBuilder<T> =
+  bind(object : TypeToken<T>(declaring?.javaClass ?: javaClass) {}.toTypeLiteral())
+
+inline fun <reified T> LinkedBindingBuilder<in T>.to(declaring: Any? = null): ScopedBindingBuilder {
+  return to(object : TypeToken<T>(declaring?.javaClass ?: javaClass) {}.toTypeLiteral())
+}
+
+inline fun <reified T> LinkedBindingBuilder<in T>.toInternalProvider(declaring: Any? = null): ScopedBindingBuilder {
+  return toProvider(
+    Anvil.getEnvironment().injector.getProvider(
+      Key.get(object : TypeToken<T>(declaring?.javaClass ?: javaClass) {}.toTypeLiteral())
+    )
+  )
+}
+
+// TODO(0.4): Remove
+fun <T> TypeToken<T>.toTypeLiteralNoInline(): TypeLiteral<T> = TypeLiteral.get(getType()) as TypeLiteral<T>
+inline fun <reified T> TypeToken<T>.toTypeLiteral(): TypeLiteral<T> = TypeLiteral.get(getType()) as TypeLiteral<T>
+fun Binder.withMongoDB() = bind<DataStoreContext<ObjectId, Datastore>>().to<MongoContext>()
+fun Binder.withXodus() = bind<DataStoreContext<EntityId, PersistentEntityStore>>().to<XodusContext>()

anvil-api/src/main/java/org/anvilpowered/anvil/api/misc/_AbstractModule.kt

@@ -21,7 +21,7 @@ package org.anvilpowered.anvil.api.plugin
 import net.kyori.adventure.text.Component
 import org.anvilpowered.anvil.api.misc.Named
 
-interface PluginInfo: Named {
+interface PluginInfo : Named {
 
   val prefix: Component
 

anvil-api/src/main/kotlin/org/anvilpowered/anvil/api/plugin/PluginInfo.kt

@@ -28,7 +28,7 @@
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
-import org.anvilpowered.anvil.api.misc.BindingExtensions;
+import org.anvilpowered.anvil.api.misc._AbstractModuleKt;
 import org.anvilpowered.anvil.api.registry.Registry;
 import org.anvilpowered.anvil.api.registry.RegistryScope;
 import org.anvilpowered.anvil.common.PlatformImpl;
@@ -206,7 +206,7 @@ public Environment.Builder addEarlyServices(TypeLiteral<?>... typeLiterals) {
 
     @Override
     public Environment.Builder addEarlyServices(TypeToken<?>... typeTokens) {
-        return addEarlyServices(Stream.of(typeTokens), BindingExtensions::getKey);
+        return addEarlyServices(Stream.of(typeTokens), typeToken -> Key.get(_AbstractModuleKt.toTypeLiteralNoInline(typeToken)));
     }
 
     @Override
@@ -229,7 +229,7 @@ public <T> Environment.Builder addEarlyServices(TypeLiteral<T> typeLiteral, Cons
 
     @Override
     public <T> Environment.Builder addEarlyServices(TypeToken<T> typeToken, Consumer<T> initializer) {
-        earlyServices.put(BindingExtensions.getKey(typeToken), initializer);
+        earlyServices.put(Key.get(_AbstractModuleKt.toTypeLiteralNoInline(typeToken)), initializer);
         return this;
     }
 

anvil-common/src/main/java/org/anvilpowered/anvil/api/EnvironmentBuilderImpl.java

@@ -20,8 +20,8 @@
 
 import com.google.common.reflect.TypeToken;
 import com.google.inject.Injector;
-import org.anvilpowered.anvil.api.misc.BindingExtensions;
-import org.anvilpowered.anvil.common.misc.CommonBindingExtensions;
+import com.google.inject.Key;
+import org.anvilpowered.anvil.api.misc._AbstractModuleKt;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -42,7 +42,6 @@ public ServiceManagerImpl() {
         functionBindings = new HashMap<>();
         registerBinding(EnvironmentManager.class, () -> environmentManager);
         registerBinding(Environment.Builder.class, EnvironmentBuilderImpl::new);
-        registerBinding(BindingExtensions.class, CommonBindingExtensions::new);
     }
 
     void setInjector(Injector injector) {
@@ -55,7 +54,7 @@ public <T> Supplier<T> provideSupplier(TypeToken<T> typeToken) {
         if (supplier != null) {
             return supplier;
         }
-        return () -> injector.getInstance(BindingExtensions.getKey(typeToken));
+        return () -> injector.getInstance(Key.get(_AbstractModuleKt.toTypeLiteralNoInline(typeToken)));
     }
 
     @Override
@@ -85,7 +84,7 @@ public <T, R> Function<T, R> provideFunction(TypeToken<R> typeToken) {
             return function;
         }
         return injector -> ((Injector) injector)
-            .getInstance(BindingExtensions.getKey(typeToken));
+            .getInstance(Key.get(_AbstractModuleKt.toTypeLiteralNoInline(typeToken)));
     }
 
     @Override