cleanup

Author: Haarolean

api/src/main/java/io/kafbat/ui/config/auth/RoleBasedAccessControlProperties.java

@@ -10,7 +10,6 @@
 public class RoleBasedAccessControlProperties {
 
   private List<Role> roles = new ArrayList<>();
-//  private String haha;
 
   @PostConstruct
   public void init() {

api/src/main/java/io/kafbat/ui/service/app/ConfigReloadService.java

@@ -1,46 +1,33 @@
 package io.kafbat.ui.service.app;
 
 import io.kafbat.ui.config.auth.RoleBasedAccessControlProperties;
-import io.kafbat.ui.service.rbac.AccessControlService;
 import io.kafbat.ui.util.MultiFileWatcher;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Properties;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import lombok.Cleanup;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.boot.env.YamlPropertySourceLoader;
 import org.springframework.boot.origin.Origin;
 import org.springframework.boot.origin.OriginTrackedValue;
 import org.springframework.boot.origin.TextResourceOrigin;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 
 @Service
-//@ConditionalOnProperty(value = "dynamic.config.autoreload", havingValue = "true")
 @RequiredArgsConstructor
 @Slf4j
 public class ConfigReloadService {
@@ -101,23 +88,25 @@ public void init() {
   private void reloadFile(Path path) {
     log.info("Reloading file {}", path);
     try {
-      if (path.toString().endsWith(".yml") || path.toString().endsWith(".yaml")) {
-        String name = String.format("Config resource 'file [%s] via location '%s'",
-          path.toAbsolutePath().toString(),
-            path.toAbsolutePath().toString());
-
-        List<PropertySource<?>> load = yamlLoader.load(path.toString(), new FileSystemResource(path));
-        environment.getPropertySources().remove(name);
-        environment.getPropertySources().addFirst(load.getFirst());
-        Binder binder = Binder.get(environment);
-        binder.bind("rbac", RoleBasedAccessControlProperties.class).ifBound(bound ->
-            rbacProperties.setRoles(bound.getRoles())
-        );
+      if (!path.toString().endsWith(".yml") && !path.toString().endsWith(".yaml")) {
+        log.trace("Skipping non-YML file {}", path);
       }
+
+      String name = String.format("Config resource 'file [%s] via location '%s'",
+          path.toAbsolutePath(),
+          path.toAbsolutePath()); // TODO extract an obj reference from env
+
+      List<PropertySource<?>> load = yamlLoader.load(path.toString(), new FileSystemResource(path));
+      environment.getPropertySources().remove(name);
+      environment.getPropertySources().addFirst(load.getFirst());
+      Binder binder = Binder.get(environment);
+
+      binder.bind("rbac", RoleBasedAccessControlProperties.class)
+          .ifBound(bound -> rbacProperties.setRoles(bound.getRoles())
+      );
     } catch (Throwable e) {
       log.error("Error while reloading file {}", path, e);
     }
-
   }
 
   @PreDestroy

api/src/main/java/io/kafbat/ui/service/rbac/AccessControlService.java

@@ -32,7 +32,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.core.env.Environment;
 import org.springframework.security.access.AccessDeniedException;

api/src/main/java/io/kafbat/ui/util/MultiFileWatcher.java

@@ -13,10 +13,8 @@
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
-import java.time.Duration;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -27,15 +25,11 @@
 @Slf4j
 public final class MultiFileWatcher implements AutoCloseable {
 
-  private static final long DEBOUNCE_MS = Duration.ofMillis(1000).toMillis();
-
   private final WatchService watchService = FileSystems.getDefault().newWatchService();
   private final Set<URI> watchedFiles = ConcurrentHashMap.newKeySet();
   private final Map<WatchKey, Path> watchDirsByKey = new HashMap<>();
   private final Consumer<Path> reloader;
 
-  private long lastTriggerAt = 0;
-
   public MultiFileWatcher(Collection<Path> filesToWatch, Consumer<Path> reloader) throws IOException {
     Assert.notNull(reloader, "reloader must not be null");
     this.reloader = reloader;
@@ -45,11 +39,11 @@ public MultiFileWatcher(Collection<Path> filesToWatch, Consumer<Path> reloader)
     }
 
 
-    List<Path> directories = filesToWatch.stream().map(Path::getParent).distinct().toList();
+    var directories = filesToWatch.stream().map(Path::getParent).distinct().toList();
     watchedFiles.addAll(filesToWatch.stream()
-            .map(p -> p.toAbsolutePath().normalize())
-            .map(Path::toUri)
-            .toList()
+        .map(p -> p.toAbsolutePath().normalize())
+        .map(Path::toUri)
+        .toList()
     );
 
     if (watchedFiles.isEmpty()) {
@@ -63,21 +57,25 @@ public MultiFileWatcher(Collection<Path> filesToWatch, Consumer<Path> reloader)
     directories
         .forEach(dir -> {
           try {
-            WatchKey key = dir.register(watchService, ENTRY_MODIFY, ENTRY_CREATE, ENTRY_DELETE);
+            var key = dir.register(watchService, ENTRY_MODIFY, ENTRY_CREATE, ENTRY_DELETE);
             watchDirsByKey.put(key, dir);
           } catch (IOException e) {
             throw new UncheckedIOException(e);
           }
         });
 
-//    log.trace("Watching directories: {}", watchDirsByKey.values().stream().map(a -> getParentPath().apply(a)).map(Path::toString).toList());
+    log.trace("Watching directories: {}", directories.stream().map(Path::toString).toList());
   }
 
   public void watchLoop() {
     while (true) {
       try {
         var key = watchService.take();
         Path dir = watchDirsByKey.get(key);
+        if (dir == null) {
+          continue;
+        }
+
         for (WatchEvent<?> event : key.pollEvents()) {
           Path relativePath = (Path) event.context();
           Path path = dir.resolve(relativePath);