WIP

incubator/binding-openapi/pom.xml

@@ -173,9 +173,10 @@
                   </fileMappers>
                 </artifactItem>
               </artifactItems>
-              <includes>io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json</includes>
-              <includes>io/aklivity/zilla/specs/binding/openapi/schema/openapi.3.0.schema.json</includes>
-              <includes>io/aklivity/zilla/specs/binding/openapi/schema/openapi.3.1.schema.json</includes>
+              <includes>io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json,
+                io/aklivity/zilla/specs/binding/openapi/schema/openapi.3.0.schema.json,
+                io/aklivity/zilla/specs/binding/openapi/schema/openapi.3.1.schema.json
+              </includes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
             </configuration>
           </execution>

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiClientCompositeBindingAdapter.java

@@ -28,16 +28,16 @@
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenapiConfig;
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenapiOptionsConfig;
 import io.aklivity.zilla.runtime.binding.openapi.internal.OpenapiBinding;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Header;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiHeader;
 import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApi;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Response;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiResponse;
 import io.aklivity.zilla.runtime.binding.openapi.internal.model.ResponseByContentType;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Server;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.OperationView;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.OperationsView;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.PathView;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.SchemaView;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.ServerView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiServer;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiOperationView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiOperationsView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiPathView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiSchemaView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiServerView;
 import io.aklivity.zilla.runtime.binding.tls.config.TlsOptionsConfig;
 import io.aklivity.zilla.runtime.engine.config.BindingConfig;
 import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
@@ -119,9 +119,9 @@ private URI findFirstServerUrlWithScheme(
     {
         requireNonNull(scheme);
         URI result = null;
-        for (Server item : openApi.servers)
+        for (OpenApiServer item : openApi.servers)
         {
-            ServerView server = ServerView.of(item);
+            OpenApiServerView server = OpenApiServerView.of(item);
             if (scheme.equals(server.url().getScheme()))
             {
                 result = server.url();
@@ -135,7 +135,7 @@ private <C> BindingConfigBuilder<C> injectHttpClientOptions(
         BindingConfigBuilder<C> binding,
         OpenApi openApi)
     {
-        OperationsView operations = OperationsView.of(openApi.paths);
+        OpenApiOperationsView operations = OpenApiOperationsView.of(openApi.paths);
         if (operations.hasResponses())
         {
             binding.
@@ -147,16 +147,16 @@ private <C> BindingConfigBuilder<C> injectHttpClientOptions(
     }
 
     private <C> HttpOptionsConfigBuilder<C> injectHttpClientRequests(
-        OperationsView operations,
+        OpenApiOperationsView operations,
         HttpOptionsConfigBuilder<C> options,
         OpenApi openApi)
     {
         for (String pathName : openApi.paths.keySet())
         {
-            PathView path = PathView.of(openApi.paths.get(pathName));
+            OpenApiPathView path = OpenApiPathView.of(openApi.paths.get(pathName));
             for (String methodName : path.methods().keySet())
             {
-                OperationView operation = operations.operation(pathName, methodName);
+                OpenApiOperationView operation = operations.operation(pathName, methodName);
                 if (operation.hasResponses())
                 {
                     options
@@ -174,7 +174,7 @@ private <C> HttpOptionsConfigBuilder<C> injectHttpClientRequests(
 
     private <C> HttpRequestConfigBuilder<C> injectResponses(
         HttpRequestConfigBuilder<C> request,
-        OperationView operation,
+        OpenApiOperationView operation,
         OpenApi openApi)
     {
         if (operation != null && operation.responsesByStatus() != null)
@@ -183,11 +183,11 @@ private <C> HttpRequestConfigBuilder<C> injectResponses(
             {
                 String status = responses0.getKey();
                 ResponseByContentType responses1 = responses0.getValue();
-                if (!(OperationView.DEFAULT.equals(status)) && responses1.content != null)
+                if (!(OpenApiOperationView.DEFAULT.equals(status)) && responses1.content != null)
                 {
-                    for (Map.Entry<String, Response> response2 : responses1.content.entrySet())
+                    for (Map.Entry<String, OpenApiResponse> response2 : responses1.content.entrySet())
                     {
-                        SchemaView schema = SchemaView.of(openApi.components.schemas, response2.getValue().schema);
+                        OpenApiSchemaView schema = OpenApiSchemaView.of(openApi.components.schemas, response2.getValue().schema);
                         request
                             .response()
                                 .status(Integer.parseInt(status))
@@ -215,7 +215,7 @@ private <C> HttpResponseConfigBuilder<C> injectResponseHeaders(
     {
         if (responses.headers != null && !responses.headers.isEmpty())
         {
-            for (Map.Entry<String, Header> header : responses.headers.entrySet())
+            for (Map.Entry<String, OpenApiHeader> header : responses.headers.entrySet())
             {
                 String name = header.getKey();
                 ModelConfig model = models.get(header.getValue().schema.type);

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiOptionsConfigAdapter.java

@@ -14,13 +14,14 @@
  */
 package io.aklivity.zilla.runtime.binding.openapi.internal.config;
 
+import static java.util.Collections.unmodifiableMap;
 import static org.agrona.LangUtil.rethrowUnchecked;
 
 import java.io.InputStream;
-import java.io.Reader;
 import java.io.StringReader;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
 import jakarta.json.Json;
@@ -33,12 +34,9 @@
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.adapter.JsonbAdapter;
-import jakarta.json.spi.JsonProvider;
-import jakarta.json.stream.JsonParser;
 
-import org.agrona.collections.IntArrayList;
+import org.agrona.collections.Object2ObjectHashMap;
 import org.leadpony.justify.api.JsonSchema;
-import org.leadpony.justify.api.JsonSchemaReader;
 import org.leadpony.justify.api.JsonValidationService;
 import org.leadpony.justify.api.ProblemHandler;
 
@@ -55,19 +53,29 @@
 import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
-import io.aklivity.zilla.runtime.engine.internal.config.schema.UniquePropertyKeysSchema;
 
 public final class OpenapiOptionsConfigAdapter implements OptionsConfigAdapterSpi, JsonbAdapter<OptionsConfig, JsonObject>
 {
     private static final String TCP_NAME = "tcp";
     private static final String TLS_NAME = "tls";
     private static final String HTTP_NAME = "http";
     private static final String SPECS_NAME = "specs";
+
+    private final Map<String, JsonSchema> schemas;
+
     private OptionsConfigAdapter tcpOptions;
     private OptionsConfigAdapter tlsOptions;
     private OptionsConfigAdapter httpOptions;
     private Function<String, String> readURL;
 
+    public OpenapiOptionsConfigAdapter()
+    {
+        Map<String, JsonSchema> schemas = new Object2ObjectHashMap<>();
+        schemas.put("3.0.0", schema("3.0.0"));
+        schemas.put("3.1.0", schema("3.1.0"));
+        this.schemas = unmodifiableMap(schemas);
+    }
+
     @Override
     public Kind kind()
     {
@@ -185,22 +193,14 @@ private OpenApi parseOpenApi(
         try
         {
             String openApiVersion = detectOpenApiVersion(openapiText);
-            InputStream schemaInput = selectSchemaPathForVersion(openApiVersion);
-
-            JsonProvider schemaProvider = JsonProvider.provider();
-            JsonParser schemaParser = schemaProvider.createParserFactory(null)
-                .createParser(schemaInput);
 
             JsonValidationService service = JsonValidationService.newInstance();
             ProblemHandler handler = service.createProblemPrinter(msg -> errors.add(new ConfigException(msg)));
-            JsonSchemaReader validator = service.createSchemaReader(schemaParser);
-            JsonSchema schema = new UniquePropertyKeysSchema(validator.read());
+            JsonSchema schema = schemas.get(openApiVersion);
 
-            JsonProvider provider = service.createJsonProvider(schema, parser -> handler);
+            service.createReader(new StringReader(openapiText), schema, handler).read();
 
-            Jsonb jsonb = JsonbBuilder.newBuilder()
-                .withProvider(provider)
-                .build();
+            Jsonb jsonb = JsonbBuilder.create();
 
             openApi = jsonb.fromJson(openapiText, OpenApi.class);
         }
@@ -240,20 +240,25 @@ private String detectOpenApiVersion(
         }
     }
 
-    private InputStream selectSchemaPathForVersion(
+    private JsonSchema schema(
         String version)
     {
+        InputStream schemaInput = null;
         if (version.startsWith("3.0"))
         {
-            return OpenapiBinding.class.getResourceAsStream("schema/openapi.3.0.schema.json");
+            schemaInput = OpenapiBinding.class.getResourceAsStream("schema/openapi.3.0.schema.json");
         }
         else if (version.startsWith("3.1"))
         {
-            return OpenapiBinding.class.getResourceAsStream("schema/openapi.3.1.schema.json");
-        }
-        else
-        {
-            throw new IllegalArgumentException("Unsupported OpenAPI version: " + version);
+            schemaInput =  OpenapiBinding.class.getResourceAsStream("schema/openapi.3.1.schema.json");
         }
+
+        JsonValidationService service = JsonValidationService.newInstance();
+
+        return service.createSchemaReaderFactoryBuilder()
+                .withSpecVersionDetection(true)
+                .build()
+                .createSchemaReader(schemaInput)
+                .read();
     }
 }

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiServerCompositeBindingAdapter.java

@@ -39,15 +39,15 @@
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenapiConfig;
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenapiOptionsConfig;
 import io.aklivity.zilla.runtime.binding.openapi.internal.OpenapiBinding;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.MediaType;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiMediaType;
 import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApi;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Operation;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Parameter;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Schema;
-import io.aklivity.zilla.runtime.binding.openapi.internal.model.Server;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.PathView;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.SchemaView;
-import io.aklivity.zilla.runtime.binding.openapi.internal.view.ServerView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiOperation;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiParameter;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiSchema;
+import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApiServer;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiPathView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiSchemaView;
+import io.aklivity.zilla.runtime.binding.openapi.internal.view.OpenApiServerView;
 import io.aklivity.zilla.runtime.binding.tcp.config.TcpConditionConfig;
 import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;
 import io.aklivity.zilla.runtime.binding.tls.config.TlsOptionsConfig;
@@ -210,10 +210,10 @@ private <C> HttpOptionsConfigBuilder<C> injectHttpServerRequests(
     {
         for (String pathName : openApi.paths.keySet())
         {
-            PathView path = PathView.of(openApi.paths.get(pathName));
+            OpenApiPathView path = OpenApiPathView.of(openApi.paths.get(pathName));
             for (String methodName : path.methods().keySet())
             {
-                Operation operation = path.methods().get(methodName);
+                OpenApiOperation operation = path.methods().get(methodName);
                 if (operation.requestBody != null || operation.parameters != null && !operation.parameters.isEmpty())
                 {
                     options
@@ -231,12 +231,12 @@ private <C> HttpOptionsConfigBuilder<C> injectHttpServerRequests(
 
     private <C> HttpRequestConfigBuilder<C> injectContent(
         HttpRequestConfigBuilder<C> request,
-        Operation operation,
+        OpenApiOperation operation,
         OpenApi openApi)
     {
         if (operation.requestBody != null && operation.requestBody.content != null && !operation.requestBody.content.isEmpty())
         {
-            SchemaView schema = resolveSchemaForJsonContentType(operation.requestBody.content, openApi);
+            OpenApiSchemaView schema = resolveSchemaForJsonContentType(operation.requestBody.content, openApi);
             if (schema != null)
             {
                 request.
@@ -255,11 +255,11 @@ private <C> HttpRequestConfigBuilder<C> injectContent(
 
     private <C> HttpRequestConfigBuilder<C> injectParams(
         HttpRequestConfigBuilder<C> request,
-        Operation operation)
+        OpenApiOperation operation)
     {
         if (operation != null && operation.parameters != null)
         {
-            for (Parameter parameter : operation.parameters)
+            for (OpenApiParameter parameter : operation.parameters)
             {
                 if (parameter.schema != null && parameter.schema.type != null)
                 {
@@ -305,7 +305,7 @@ private <C> BindingConfigBuilder<C> injectHttpServerRoutes(
     {
         for (String item : openApi.paths.keySet())
         {
-            PathView path = PathView.of(openApi.paths.get(item));
+            OpenApiPathView path = OpenApiPathView.of(openApi.paths.get(item));
             for (String method : path.methods().keySet())
             {
                 binding
@@ -324,7 +324,7 @@ private <C> BindingConfigBuilder<C> injectHttpServerRoutes(
 
     private <C> RouteConfigBuilder<C> injectHttpServerRouteGuarded(
         RouteConfigBuilder<C> route,
-        PathView path,
+        OpenApiPathView path,
         String method,
         String guardName,
         Map<String, String> securitySchemes)
@@ -391,7 +391,7 @@ private <C> InlineSchemaConfigBuilder<C> injectSubjects(
     {
         try (Jsonb jsonb = JsonbBuilder.create())
         {
-            for (Map.Entry<String, Schema> entry : openApi.components.schemas.entrySet())
+            for (Map.Entry<String, OpenApiSchema> entry : openApi.components.schemas.entrySet())
             {
                 subjects
                     .subject(entry.getKey())
@@ -413,7 +413,7 @@ private int[] resolveAllPorts(
         int[] ports = new int[openApi.servers.size()];
         for (int i = 0; i < openApi.servers.size(); i++)
         {
-            ServerView server = ServerView.of(openApi.servers.get(i));
+            OpenApiServerView server = OpenApiServerView.of(openApi.servers.get(i));
             URI url = server.url();
             ports[i] = url.getPort();
         }
@@ -440,9 +440,9 @@ private URI findFirstServerUrlWithScheme(
     {
         requireNonNull(scheme);
         URI result = null;
-        for (Server item : openApi.servers)
+        for (OpenApiServer item : openApi.servers)
         {
-            ServerView server = ServerView.of(item);
+            OpenApiServerView server = OpenApiServerView.of(item);
             if (scheme.equals(server.url().getScheme()))
             {
                 result = server.url();
@@ -472,11 +472,11 @@ private Map<String, String> resolveSecuritySchemes(
         return result;
     }
 
-    private SchemaView resolveSchemaForJsonContentType(
-        Map<String, MediaType> content,
+    private OpenApiSchemaView resolveSchemaForJsonContentType(
+        Map<String, OpenApiMediaType> content,
         OpenApi openApi)
     {
-        MediaType mediaType = null;
+        OpenApiMediaType mediaType = null;
         if (content != null)
         {
             for (String contentType : content.keySet())
@@ -489,6 +489,6 @@ private SchemaView resolveSchemaForJsonContentType(
             }
         }
 
-        return mediaType == null ? null : SchemaView.of(openApi.components.schemas, mediaType.schema);
+        return mediaType == null ? null : OpenApiSchemaView.of(openApi.components.schemas, mediaType.schema);
     }
 }

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/model/OpenApi.java

@@ -20,7 +20,7 @@
 public class OpenApi
 {
     public String openapi;
-    public List<Server> servers;
+    public List<OpenApiServer> servers;
     public Map<String, PathItem> paths;
-    public Components components;
+    public OpenApiComponents components;
 }

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/model/BearerAuth.java → incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/model/OpenApiBearerAuth.java

@@ -14,7 +14,7 @@
  */
 package io.aklivity.zilla.runtime.binding.openapi.internal.model;
 
-public class BearerAuth
+public class OpenApiBearerAuth
 {
     public String bearerFormat;
 }