WIP EngineManager addResources

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/EngineConfigReader.java

@@ -55,7 +55,6 @@
 import io.aklivity.zilla.runtime.engine.EngineConfiguration;
 import io.aklivity.zilla.runtime.engine.internal.config.NamespaceAdapter;
 import io.aklivity.zilla.runtime.engine.internal.config.schema.UniquePropertyKeysSchema;
-import io.aklivity.zilla.runtime.engine.internal.watcher.EngineConfigWatcher;
 import io.aklivity.zilla.runtime.engine.resolver.Resolver;
 
 public final class EngineConfigReader
@@ -64,24 +63,24 @@ public final class EngineConfigReader
     private final ConfigAdapterContext context;
     private final Resolver expressions;
     private final Collection<URL> schemaTypes;
-    private final EngineConfigWatcher watcher;
     private final Consumer<String> logger;
+    private final Consumer<NamespaceConfig> addResources;
     private final MessageDigest md5;
 
     public EngineConfigReader(
         EngineConfiguration config,
         ConfigAdapterContext context,
         Resolver expressions,
         Collection<URL> schemaTypes,
-        EngineConfigWatcher watcher,
-        Consumer<String> logger)
+        Consumer<String> logger,
+        Consumer<NamespaceConfig> addResources)
     {
         this.config = config;
         this.context = context;
         this.expressions = expressions;
         this.schemaTypes = schemaTypes;
-        this.watcher = watcher;
         this.logger = logger;
+        this.addResources = addResources;
         this.md5 = initMessageDigest("MD5");
     }
 
@@ -183,7 +182,7 @@ public EngineConfig read(
                 reader.skip(configsAt.get(i));
                 NamespaceConfig namespace = jsonb.fromJson(reader, NamespaceConfig.class);
                 namespace.hash = hashes.get(i);
-                watcher.addResources(namespace.resources, namespace.name);
+                addResources.accept(namespace);
                 builder.namespace(namespace);
 
                 if (!errors.isEmpty())

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/EngineManager.java

@@ -225,8 +225,8 @@ private EngineConfig parse(
                 new NamespaceConfigAdapterContext(readURL),
                 expressions,
                 schemaTypes,
-                watcher,
-                logger);
+                logger,
+                this::addResources);
 
             engine = reader.read(configText);
 
@@ -249,6 +249,12 @@ private EngineConfig parse(
         return engine;
     }
 
+    private void addResources(
+        NamespaceConfig namespace)
+    {
+        watcher.addResources(namespace.resources, namespace.name);
+    }
+
     private void process(
         List<GuardConfig> guards,
         NamespaceConfig namespace)