Add CatalogConfig.builder() methods

runtime/catalog-apicurio/src/test/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioCatalogFactoryTest.java

@@ -17,20 +17,12 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-import java.time.Duration;
 
 import org.junit.Test;
 
-import io.aklivity.zilla.runtime.catalog.apicurio.internal.config.ApicurioOptionsConfig;
 import io.aklivity.zilla.runtime.engine.Configuration;
-import io.aklivity.zilla.runtime.engine.EngineContext;
 import io.aklivity.zilla.runtime.engine.catalog.Catalog;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogContext;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogFactory;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
 
 public class ApicurioCatalogFactoryTest
 {
@@ -39,24 +31,9 @@ public void shouldLoadAndCreate()
     {
         Configuration config = new Configuration();
         CatalogFactory factory = CatalogFactory.instantiate();
-        Catalog catalog = factory.create("apicurio", config);
+        Catalog catalog = factory.create(ApicurioCatalog.NAME, config);
 
         assertThat(catalog, instanceOf(ApicurioCatalog.class));
-        assertEquals("apicurio", catalog.name());
-
-        CatalogContext context = catalog.supply(mock(EngineContext.class));
-        assertThat(context, instanceOf(ApicurioCatalogContext.class));
-
-        ApicurioOptionsConfig catalogConfig = ApicurioOptionsConfig.builder()
-            .url("http://localhost:8080")
-            .groupId("my-group")
-            .useId("contentId")
-            .idEncoding("legacy")
-            .maxAge(Duration.ofSeconds(100))
-            .build();
-        CatalogConfig options = new CatalogConfig("test", "catalog0", "apicurio", catalogConfig);
-        CatalogHandler handler = context.attach(options);
-
-        assertThat(handler, instanceOf(ApicurioCatalogHandler.class));
+        assertEquals(ApicurioCatalog.NAME, catalog.name());
     }
 }

runtime/catalog-filesystem/src/test/java/io/aklivity/zilla/runtime/catalog/filesystem/internal/FilesystemCatalogFactoryTest.java

@@ -14,27 +14,15 @@
  */
 package io.aklivity.zilla.runtime.catalog.filesystem.internal;
 
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-import java.net.URL;
-import java.nio.file.Path;
 
 import org.junit.Test;
-import org.mockito.Mockito;
 
-import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.FilesystemOptionsConfig;
-import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.FilesystemSchemaConfig;
 import io.aklivity.zilla.runtime.engine.Configuration;
-import io.aklivity.zilla.runtime.engine.EngineContext;
 import io.aklivity.zilla.runtime.engine.catalog.Catalog;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogContext;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogFactory;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
 
 public class FilesystemCatalogFactoryTest
 {
@@ -43,27 +31,9 @@ public void shouldLoadAndCreate() throws Exception
     {
         Configuration config = new Configuration();
         CatalogFactory factory = CatalogFactory.instantiate();
-        Catalog catalog = factory.create("filesystem", config);
+        Catalog catalog = factory.create(FilesystemCatalog.NAME, config);
 
         assertThat(catalog, instanceOf(FilesystemCatalog.class));
-        assertEquals("filesystem", catalog.name());
-
-        EngineContext engineContext = mock(EngineContext.class);
-        URL url = FilesystemCatalogFactoryTest.class
-            .getResource("../../../../specs/catalog/filesystem/config/asyncapi/mqtt.yaml");
-        Path path = Path.of(url.toURI());
-        Mockito.doReturn(path).when(engineContext).resolvePath("asyncapi/mqtt.yaml");
-
-        CatalogContext context = catalog.supply(engineContext);
-        assertThat(context, instanceOf(FilesystemCatalogContext.class));
-
-        FilesystemOptionsConfig catalogConfig =
-            new FilesystemOptionsConfig(singletonList(
-                new FilesystemSchemaConfig("subject1", "asyncapi/mqtt.yaml")));
-
-        CatalogConfig options = new CatalogConfig("test", "catalog0", "filesystem", catalogConfig);
-        CatalogHandler handler = context.attach(options);
-
-        assertThat(handler, instanceOf(FilesystemCatalogHandler.class));
+        assertEquals(FilesystemCatalog.NAME, catalog.name());
     }
 }

runtime/catalog-inline/src/test/java/io/aklivity/zilla/runtime/catalog/inline/InlineCatalogFactoryTest.java

@@ -14,26 +14,20 @@
  */
 package io.aklivity.zilla.runtime.catalog.inline;
 
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
 
-import io.aklivity.zilla.runtime.catalog.inline.config.InlineOptionsConfig;
-import io.aklivity.zilla.runtime.catalog.inline.config.InlineSchemaConfig;
 import io.aklivity.zilla.runtime.catalog.inline.internal.InlineCatalog;
 import io.aklivity.zilla.runtime.catalog.inline.internal.InlineCatalogContext;
-import io.aklivity.zilla.runtime.catalog.inline.internal.InlineCatalogHandler;
 import io.aklivity.zilla.runtime.engine.Configuration;
 import io.aklivity.zilla.runtime.engine.EngineContext;
 import io.aklivity.zilla.runtime.engine.catalog.Catalog;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogContext;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogFactory;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
 
 public class InlineCatalogFactoryTest
 {
@@ -42,19 +36,12 @@ public void shouldLoadAndCreate()
     {
         Configuration config = new Configuration();
         CatalogFactory factory = CatalogFactory.instantiate();
-        Catalog catalog = factory.create("inline", config);
+        Catalog catalog = factory.create(InlineCatalog.NAME, config);
 
         assertThat(catalog, instanceOf(InlineCatalog.class));
-        assertEquals("inline", catalog.name());
+        assertEquals(InlineCatalog.NAME, catalog.name());
 
         CatalogContext context = catalog.supply(mock(EngineContext.class));
         assertThat(context, instanceOf(InlineCatalogContext.class));
-
-        InlineOptionsConfig catalogConfig =
-                new InlineOptionsConfig(singletonList(
-                        new InlineSchemaConfig("subject1", "latest", "{\"type\": \"string\"}")));
-        CatalogConfig options = new CatalogConfig("test", "catalog0", "inline", catalogConfig);
-        CatalogHandler handler = context.attach(options);
-        assertThat(handler, instanceOf(InlineCatalogHandler.class));
     }
 }

runtime/catalog-karapace/src/test/java/io/aklivity/zilla/runtime/catalog/karapace/internal/KarapaceCatalogFactoryTest.java

@@ -17,20 +17,12 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-import java.time.Duration;
 
 import org.junit.Test;
 
-import io.aklivity.zilla.runtime.catalog.karapace.internal.config.KarapaceOptionsConfig;
 import io.aklivity.zilla.runtime.engine.Configuration;
-import io.aklivity.zilla.runtime.engine.EngineContext;
 import io.aklivity.zilla.runtime.engine.catalog.Catalog;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogContext;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogFactory;
-import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
-import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
 
 public class KarapaceCatalogFactoryTest
 {
@@ -39,22 +31,9 @@ public void shouldLoadAndCreate()
     {
         Configuration config = new Configuration();
         CatalogFactory factory = CatalogFactory.instantiate();
-        Catalog catalog = factory.create("karapace", config);
+        Catalog catalog = factory.create(KarapaceCatalog.NAME, config);
 
         assertThat(catalog, instanceOf(KarapaceCatalog.class));
-        assertEquals("karapace", catalog.name());
-
-        CatalogContext context = catalog.supply(mock(EngineContext.class));
-        assertThat(context, instanceOf(KarapaceCatalogContext.class));
-
-        KarapaceOptionsConfig catalogConfig = KarapaceOptionsConfig.builder()
-            .url("http://localhost:8081")
-            .context("default")
-            .maxAge(Duration.ofSeconds(100))
-            .build();
-        CatalogConfig options = new CatalogConfig("test", "catalog0", "karapace", catalogConfig);
-        CatalogHandler handler = context.attach(options);
-
-        assertThat(handler, instanceOf(KarapaceCatalogHandler.class));
+        assertEquals(KarapaceCatalog.NAME, catalog.name());
     }
 }

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

@@ -16,6 +16,9 @@
 package io.aklivity.zilla.runtime.engine.config;
 
 import static java.util.Objects.requireNonNull;
+import static java.util.function.Function.identity;
+
+import java.util.function.Function;
 
 public class CatalogConfig
 {
@@ -27,7 +30,18 @@ public class CatalogConfig
     public final String type;
     public final OptionsConfig options;
 
-    public CatalogConfig(
+    public static CatalogConfigBuilder<CatalogConfig> builder()
+    {
+        return new CatalogConfigBuilder<>(identity());
+    }
+
+    public static <T> CatalogConfigBuilder<T> builder(
+        Function<CatalogConfig, T> mapper)
+    {
+        return new CatalogConfigBuilder<>(mapper);
+    }
+
+    CatalogConfig(
         String namespace,
         String name,
         String type,

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

@@ -63,13 +63,13 @@ public CatalogConfigBuilder<T> type(
     }
 
     public <C extends ConfigBuilder<CatalogConfigBuilder<T>, C>> C options(
-            Function<Function<OptionsConfig, CatalogConfigBuilder<T>>, C> options)
+        Function<Function<OptionsConfig, CatalogConfigBuilder<T>>, C> options)
     {
         return options.apply(this::options);
     }
 
     public CatalogConfigBuilder<T> options(
-            OptionsConfig options)
+        OptionsConfig options)
     {
         this.options = options;
         return this;

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/factory/Factory.java

@@ -32,6 +32,11 @@ protected static <S extends FactorySpi, F> F instantiate(
         for (S factory : filter(factories))
         {
             factoriesByType.put(factory.type(), factory);
+
+            for (String alias : factory.aliases())
+            {
+                factoriesByType.put(alias, factory);
+            }
         }
 
         return construct.apply(unmodifiableMap(factoriesByType));

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/factory/FactorySpi.java

@@ -15,7 +15,14 @@
  */
 package io.aklivity.zilla.runtime.engine.factory;
 
+import java.util.Set;
+
 public interface FactorySpi
 {
     String type();
+
+    default Set<String> aliases()
+    {
+        return Set.of();
+    }
 }

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/config/CatalogAdapter.java

@@ -20,8 +20,8 @@
 import jakarta.json.JsonObjectBuilder;
 
 import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
+import io.aklivity.zilla.runtime.engine.config.CatalogConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
-import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
 
@@ -67,14 +67,20 @@ public CatalogConfig adaptFromJson(
         String name,
         JsonObject object)
     {
+        CatalogConfigBuilder<CatalogConfig> builder = CatalogConfig.builder()
+            .namespace(namespace)
+            .name(name);
+
         String type = object.getString(TYPE_NAME);
+        builder.type(type);
 
         options.adaptType(type);
 
-        OptionsConfig opts = object.containsKey(OPTIONS_NAME) ?
-                options.adaptFromJson(object.getJsonObject(OPTIONS_NAME)) :
-                null;
+        if (object.containsKey(OPTIONS_NAME))
+        {
+            builder.options(options.adaptFromJson(object.getJsonObject(OPTIONS_NAME)));
+        }
 
-        return new CatalogConfig(namespace, name, type, opts);
+        return builder.build();
     }
 }

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/config/TestCatalogConfig.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021-2023 Aklivity Inc.
+ *
+ * Aklivity licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.aklivity.zilla.runtime.engine.test.internal.catalog.config;
+
+import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
+
+public class TestCatalogConfig
+{
+    public final long id;
+    public final TestCatalogOptionsConfig options;
+
+    public TestCatalogConfig(
+        CatalogConfig catalog)
+    {
+        this.id = catalog.id;
+        this.options = (TestCatalogOptionsConfig) catalog.options;
+    }
+}

runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/internal/catalog/config/TestCatalogOptionsConfig.java

@@ -32,7 +32,7 @@ public static TestCatalogOptionsConfigBuilder<TestCatalogOptionsConfig> builder(
     }
 
     public static <T> TestCatalogOptionsConfigBuilder<T> builder(
-            Function<OptionsConfig, T> mapper)
+        Function<OptionsConfig, T> mapper)
     {
         return new TestCatalogOptionsConfigBuilder<>(mapper);
     }