Merge branch 'develop' into resolver-config

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/resolver/EnvironmentResolverFactorySpi.java

@@ -21,7 +21,7 @@
 public class EnvironmentResolverFactorySpi implements ResolverFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return "env";
     }

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/resolver/Resolver.java

@@ -15,9 +15,12 @@
  */
 package io.aklivity.zilla.runtime.engine.resolver;
 
+import static io.aklivity.zilla.runtime.common.feature.FeatureFilter.filter;
+import static java.util.Collections.unmodifiableMap;
 import static java.util.Objects.requireNonNull;
 import static java.util.ServiceLoader.load;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,7 +38,7 @@ public final class Resolver
     public static Resolver instantiate(
         Configuration config)
     {
-        return instantiate(config, load(ResolverFactorySpi.class));
+        return instantiate(config, filter(load(ResolverFactorySpi.class)));
     }
 
     public String resolve(
@@ -56,10 +59,10 @@ private String resolve(
 
     private static Resolver instantiate(
         Configuration config,
-        ServiceLoader<ResolverFactorySpi> factories)
+        Iterable<ResolverFactorySpi> factories)
     {
         Map<String, ResolverSpi> resolversByName = new HashMap<>();
-        factories.forEach(f -> resolversByName.put(f.name(), f.create(config)));
+        factories.forEach(f -> resolversByName.put(f.type(), f.create(config)));
         return new Resolver(unmodifiableMap(resolversByName));
     }
 

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/resolver/ResolverFactorySpi.java

@@ -16,11 +16,10 @@
 package io.aklivity.zilla.runtime.engine.resolver;
 
 import io.aklivity.zilla.runtime.engine.Configuration;
+import io.aklivity.zilla.runtime.engine.factory.FactorySpi;
 
-public interface ResolverFactorySpi
+public interface ResolverFactorySpi extends FactorySpi
 {
-    String name();
-
     ResolverSpi create(
         Configuration config);
 }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/resolver/TestResolverFactorySpi.java

@@ -21,7 +21,7 @@
 public class TestResolverFactorySpi implements ResolverFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return "test";
     }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/resolver/TestResolverSpi.java

@@ -19,7 +19,6 @@
 
 public class TestResolverSpi implements ResolverSpi
 {
-    @Override
     public String resolve(
         String var)
     {