use EnabledState

comroid-git · Dec 19, 2023 · d8273d0 · d8273d0
1 parent 096f98d
commit d8273d0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/core/main/java/org/comroid/mcsd/core/MCSD.java b/src/core/main/java/org/comroid/mcsd/core/MCSD.java
@@ -189,7 +189,7 @@ public ScheduledFuture<?> shutdownForAutoUpdateTask(@Autowired ScheduledExecutor
     @DependsOn("applicationContextProvider")
     public Set<AbstractEntity> migrateEntities() {
         class Helper {
-            <T extends ModulePrototype> void getOrMigrate(Server server, ModulePrototype.Type type, Supplier<T> migratedObj) {
+            <T extends AbstractEntity> void getOrMigrate(Server server, ModulePrototype.Type type, Supplier<T> migratedObj) {
                 var repo = type.getRepo().apply(MCSD.this);
                 if (repo.findByServerIdAndDtype(server.getId(), type.name()).isPresent())
                     return;
@@ -245,8 +245,8 @@ <T extends AbstractEntity> void save(AbstractEntity.Repo<?> repo, T migrate) {
            //    //todo: fix BackupModule.Factory,
                     helper.getOrMigrate(server, ModulePrototype.Type.Backup,
                             () -> new BackupModulePrototype()
-                                    .setServer(server)
-                                    .setEnabled(false));
+                                    .setEnabled(false)
+                                    .setServer(server));
            //    ConsolePlayerEventModule.Factory,
                     helper.getOrMigrate(server, ModulePrototype.Type.ConsolePlayerEvent,
                             () -> new ConsolePlayerEventModulePrototype()

diff --git a/src/core/main/java/org/comroid/mcsd/core/ServerManager.java b/src/core/main/java/org/comroid/mcsd/core/ServerManager.java
@@ -11,6 +11,7 @@
 import org.comroid.util.Streams;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
@@ -24,6 +25,7 @@
 
 @Log
 @Service
+@DependsOn("migrateEntities")
 public class ServerManager {
     public static final Duration TickRate = Duration.ofSeconds(30);
     private final Map<UUID, Entry> cache = new ConcurrentHashMap<>();
@@ -125,6 +127,10 @@ public long cleanupModules() {
                     .count();
         }
 
+        public long reloadProtos() {
+            return 0; //todo
+        }
+
         /**
          * Loads all modules that are in DB but are not loaded as a module
          */

diff --git a/src/core/main/java/org/comroid/mcsd/core/entity/module/ModulePrototype.java b/src/core/main/java/org/comroid/mcsd/core/entity/module/ModulePrototype.java
@@ -38,7 +38,9 @@
 import org.comroid.mcsd.core.module.status.UpdateModule;
 import org.comroid.mcsd.core.module.status.UptimeModule;
 import org.comroid.mcsd.core.repo.module.ModuleRepo;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -56,6 +58,11 @@ public abstract class ModulePrototype extends AbstractEntity {
     private String dtype = Type.of(this).require(Enum::name, "Unimplemented type: " + lessSimpleName(getClass()));
     private boolean enabled = true;
 
+    @Override
+    public @Nullable String getDisplayName() {
+        return Objects.requireNonNull(super.getDisplayName(), ()->dtype+" for "+server);
+    }
+
     public <T extends ServerModule<P>, P extends ModulePrototype> T toModule(Server server) {
         var type = Type.valueOf(dtype);
         if (!type.proto.isAssignableFrom(getClass()))

diff --git a/src/core/main/java/org/comroid/mcsd/core/module/ServerModule.java b/src/core/main/java/org/comroid/mcsd/core/module/ServerModule.java
@@ -1,6 +1,9 @@
 package org.comroid.mcsd.core.module;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.comroid.api.Component;
 import org.comroid.api.Named;
 import org.comroid.mcsd.core.ServerManager;
@@ -10,16 +13,22 @@
 
 import static org.comroid.mcsd.core.util.ApplicationContextProvider.bean;
 
-@Data
+@Getter
+@AllArgsConstructor
 public abstract class ServerModule<T extends ModulePrototype> extends Component.Base implements Named {
     protected final Server server;
-    protected final T proto;
+    protected T proto;
 
     @Override
     public @Nullable Component getParent() {
         return bean(ServerManager.class).tree(server);
     }
 
+    @Override
+    public boolean isEnabled() {
+        return proto.isEnabled();
+    }
+
     @Override
     public boolean isSubComponent() {
         return true;