chore: apply rc12 injection related changes (#80)

Author: derklaro

cloudnet-rest-module/src/main/java/eu/cloudnetservice/ext/modules/rest/CloudNetRestModule.java

@@ -16,8 +16,7 @@
 
 package eu.cloudnetservice.ext.modules.rest;
 
-import dev.derklaro.aerogel.SpecifiedInjector;
-import dev.derklaro.aerogel.binding.BindingBuilder;
+import dev.derklaro.aerogel.Injector;
 import eu.cloudnetservice.driver.document.DocumentFactory;
 import eu.cloudnetservice.driver.event.EventManager;
 import eu.cloudnetservice.driver.inject.InjectionLayer;
@@ -108,17 +107,16 @@ public void initHttpServer(@Named("module") @NonNull InjectionLayer<?> injection
     // registers the validation-enabling context decorator
     var validationDecorator = ValidationHandlerMethodContextDecorator.withDefaultValidator();
     server.annotationParser().registerHandlerContextDecorator(validationDecorator);
+    server.annotationParser().registerAnnotationProcessor(new CloudNetLoggerInterceptor());
 
-    // bind the server and register it for injection
+    // bind the server listeners
     restConfig.httpListeners().forEach(listener -> server.addListener(listener).join());
-    injectionLayer.install(BindingBuilder.create().bind(HttpServer.class).toInstance(server));
-
-    // add the cloudnet logger interceptor
-    server.annotationParser().registerAnnotationProcessor(new CloudNetLoggerInterceptor());
 
-    // bind the rest user management for injection
+    // register required instances for injection
     var restUserManagement = RestUserManagementLoader.load();
-    injectionLayer.install(BindingBuilder.create().bind(RestUserManagement.class).toInstance(restUserManagement));
+    var bindingBuilder = injectionLayer.injector().createBindingBuilder();
+    injectionLayer.install(bindingBuilder.bind(HttpServer.class).toInstance(server));
+    injectionLayer.install(bindingBuilder.bind(RestUserManagement.class).toInstance(restUserManagement));
   }
 
   @ModuleTask(order = 107, lifecycle = ModuleLifeCycle.STARTED)
@@ -164,7 +162,7 @@ public void scheduleBridgeInitialization(
     @NonNull Scheduler scheduler,
     @NonNull ModuleProvider moduleProvider,
     @NonNull HttpServer server,
-    @NonNull @Named("module") InjectionLayer<SpecifiedInjector> moduleLayer
+    @NonNull @Named("module") InjectionLayer<Injector> moduleLayer
   ) {
     // we want to register the bridge handlers after all modules are started
     scheduler.runTask(() -> CloudNetBridgeInitializer.installBridgeHandler(moduleProvider, server, moduleLayer));
@@ -178,11 +176,11 @@ public void registerListener(@NonNull EventManager eventManager) {
   @ModuleTask(lifecycle = ModuleLifeCycle.STOPPED)
   public void unregisterModule(
     @NonNull HttpServer httpServer,
-    @Named("module") InjectionLayer<SpecifiedInjector> layer
+    @Named("module") InjectionLayer<Injector> layer
   ) {
     try {
       httpServer.close();
-      layer.injector().removeConstructedBindings();
+      layer.injector().close();
     } catch (Exception exception) {
       LOGGER.error("Unable to close http server while disabling cloudnet rest module.", exception);
     }

cloudnet-rest-module/src/main/java/eu/cloudnetservice/ext/modules/rest/listener/CloudNetBridgeInitializer.java

@@ -16,7 +16,7 @@
 
 package eu.cloudnetservice.ext.modules.rest.listener;
 
-import dev.derklaro.aerogel.SpecifiedInjector;
+import dev.derklaro.aerogel.Injector;
 import eu.cloudnetservice.driver.inject.InjectionLayer;
 import eu.cloudnetservice.driver.module.ModuleLifeCycle;
 import eu.cloudnetservice.driver.module.ModuleProvider;
@@ -35,7 +35,7 @@ public class CloudNetBridgeInitializer {
   public static void installBridgeHandler(
     @NonNull ModuleProvider moduleProvider,
     @NonNull HttpServer server,
-    @NonNull InjectionLayer<SpecifiedInjector> moduleLayer
+    @NonNull InjectionLayer<Injector> moduleLayer
   ) {
     var bridgeModule = moduleProvider.module(BRIDGE_MODULE_NAME);
     if (bridgeModule == null || bridgeModule.moduleLifeCycle() != ModuleLifeCycle.STARTED) {