Upgrade data-models to support AsyncAPI 3 (#4928)

Author: EricWittmann

pom.xml

@@ -172,7 +172,7 @@
     <skipCommitIdPlugin>true</skipCommitIdPlugin>
 
     <!-- Apicurio Data Models (OpenAPI and AsyncAPI support) -->
-    <apicurio-data-models.version>2.0.4</apicurio-data-models.version>
+    <apicurio-data-models.version>2.1.0</apicurio-data-models.version>
 
     <!-- GraphQL -->
     <graphql.version>22.1</graphql.version>
@@ -956,7 +956,6 @@
               <headerLocation>.checkstyle/java.header</headerLocation>
               <suppressionsLocation>.checkstyle/suppressions.xml</suppressionsLocation>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
-              <encoding>UTF-8</encoding>
               <consoleOutput>true</consoleOutput>
               <failsOnError>true</failsOnError>
             </configuration>

schema-util/openapi/src/main/java/io/apicurio/registry/content/dereference/ReferenceRewriter.java

@@ -5,6 +5,13 @@
 import io.apicurio.datamodels.models.Node;
 import io.apicurio.datamodels.models.Referenceable;
 import io.apicurio.datamodels.models.asyncapi.AsyncApiMessage;
+import io.apicurio.datamodels.models.asyncapi.v20.AsyncApi20Message;
+import io.apicurio.datamodels.models.asyncapi.v21.AsyncApi21Message;
+import io.apicurio.datamodels.models.asyncapi.v22.AsyncApi22Message;
+import io.apicurio.datamodels.models.asyncapi.v23.AsyncApi23Message;
+import io.apicurio.datamodels.models.asyncapi.v24.AsyncApi24Message;
+import io.apicurio.datamodels.models.asyncapi.v25.AsyncApi25Message;
+import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Message;
 import io.apicurio.datamodels.models.visitors.AllNodeVisitor;
 
 import java.util.Map;
@@ -45,7 +52,7 @@ public void visitMessage(AsyncApiMessage node) {
 
         // Note: for now we have special handling of the payload because it's not yet fully modeled in the
         // apicurio-data-models library.
-        JsonNode payload = node.getPayload();
+        JsonNode payload = getPayload(node);
         if (payload != null && payload.hasNonNull("$ref")) {
             String $ref = payload.get("$ref").asText();
             if (referenceUrls.containsKey($ref)) {
@@ -54,4 +61,29 @@ public void visitMessage(AsyncApiMessage node) {
         }
     }
 
+    private JsonNode getPayload(AsyncApiMessage node) {
+        if (node instanceof AsyncApi20Message) {
+            return ((AsyncApi20Message) node).getPayload();
+        }
+        if (node instanceof AsyncApi21Message) {
+            return ((AsyncApi21Message) node).getPayload();
+        }
+        if (node instanceof AsyncApi22Message) {
+            return ((AsyncApi22Message) node).getPayload();
+        }
+        if (node instanceof AsyncApi23Message) {
+            return ((AsyncApi23Message) node).getPayload();
+        }
+        if (node instanceof AsyncApi24Message) {
+            return ((AsyncApi24Message) node).getPayload();
+        }
+        if (node instanceof AsyncApi25Message) {
+            return ((AsyncApi25Message) node).getPayload();
+        }
+        if (node instanceof AsyncApi26Message) {
+            return ((AsyncApi26Message) node).getPayload();
+        }
+        return null;
+    }
+
 }

schema-util/openapi/src/main/java/io/apicurio/registry/content/refs/AbstractDataModelsReferenceFinder.java

@@ -8,6 +8,13 @@
 import io.apicurio.datamodels.models.Node;
 import io.apicurio.datamodels.models.Referenceable;
 import io.apicurio.datamodels.models.asyncapi.AsyncApiMessage;
+import io.apicurio.datamodels.models.asyncapi.v20.AsyncApi20Message;
+import io.apicurio.datamodels.models.asyncapi.v21.AsyncApi21Message;
+import io.apicurio.datamodels.models.asyncapi.v22.AsyncApi22Message;
+import io.apicurio.datamodels.models.asyncapi.v23.AsyncApi23Message;
+import io.apicurio.datamodels.models.asyncapi.v24.AsyncApi24Message;
+import io.apicurio.datamodels.models.asyncapi.v25.AsyncApi25Message;
+import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Message;
 import io.apicurio.datamodels.models.visitors.AllNodeVisitor;
 import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.content.util.ContentTypeUtil;
@@ -72,14 +79,39 @@ protected void visitNode(Node node) {
         public void visitMessage(AsyncApiMessage node) {
             // Note: special handling of message payloads because data-models doesn't fully model the payload
             // yet.
-            JsonNode payload = node.getPayload();
+            JsonNode payload = getPayload(node);
             if (payload != null && payload.has("$ref") && !payload.get("$ref").isNull()) {
                 String ref = payload.get("$ref").asText();
                 allReferences.add(ref);
             }
             super.visitMessage(node);
         }
 
+        private JsonNode getPayload(AsyncApiMessage node) {
+            if (node instanceof AsyncApi20Message) {
+                return ((AsyncApi20Message) node).getPayload();
+            }
+            if (node instanceof AsyncApi21Message) {
+                return ((AsyncApi21Message) node).getPayload();
+            }
+            if (node instanceof AsyncApi22Message) {
+                return ((AsyncApi22Message) node).getPayload();
+            }
+            if (node instanceof AsyncApi23Message) {
+                return ((AsyncApi23Message) node).getPayload();
+            }
+            if (node instanceof AsyncApi24Message) {
+                return ((AsyncApi24Message) node).getPayload();
+            }
+            if (node instanceof AsyncApi25Message) {
+                return ((AsyncApi25Message) node).getPayload();
+            }
+            if (node instanceof AsyncApi26Message) {
+                return ((AsyncApi26Message) node).getPayload();
+            }
+            return null;
+        }
+
     }
 
 }