fix: properly support multiple types in asyncapi 2.6.0

.gitignore

@@ -1,29 +1,15 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
 
 # CMake
 cmake-build-debug/
 
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
 ## Plugin-specific files:
 
 # IntelliJ

asyncapi-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>asyncapi</artifactId>
         <groupId>com.asyncapi</groupId>
-        <version>1.0.0-EAP-2</version>
+        <version>1.0.0-EAP-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

asyncapi-core/src/main/java/com/asyncapi/v2/ChannelBindingValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define ChannelBinding compatible objects.
+ */
+public interface ChannelBindingValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/CorrelationIdValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define CorrelationId compatible objects.
+ */
+public interface CorrelationIdValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/MessageBindingValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define MessageBinding compatible objects.
+ */
+public interface MessageBindingValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/MessageTraitValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define MessageTrait compatible objects.
+ */
+public interface MessageTraitValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/MessageValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define Message compatible objects.
+ */
+public interface MessageValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/OperationBindingValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define OperationBinding compatible objects.
+ */
+public interface OperationBindingValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/OperationTraitValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define OperationTrait compatible objects.
+ */
+public interface OperationTraitValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/ParameterValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define Message compatible objects.
+ */
+public interface ParameterValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/SchemaValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define Schema compatible objects.
+ */
+public interface SchemaValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/SecuritySchemeValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define SecurityScheme compatible objects.
+ */
+public interface SecuritySchemeValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/ServerBindingValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define ServerBinding compatible objects.
+ */
+public interface ServerBindingValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/ServerValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define Server compatible objects.
+ */
+public interface ServerValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/ServerVariableValue.java

@@ -0,0 +1,7 @@
+package com.asyncapi.v2;
+
+/**
+ * Interface to define ServerVariable compatible objects.
+ */
+public interface ServerVariableValue {
+}

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/Reference.java

@@ -1,5 +1,18 @@
 package com.asyncapi.v2._6_0.model;
 
+import com.asyncapi.v2.ChannelBindingValue;
+import com.asyncapi.v2.CorrelationIdValue;
+import com.asyncapi.v2.MessageBindingValue;
+import com.asyncapi.v2.MessageTraitValue;
+import com.asyncapi.v2.MessageValue;
+import com.asyncapi.v2.OperationBindingValue;
+import com.asyncapi.v2.OperationTraitValue;
+import com.asyncapi.v2.ParameterValue;
+import com.asyncapi.v2.SchemaValue;
+import com.asyncapi.v2.SecuritySchemeValue;
+import com.asyncapi.v2.ServerBindingValue;
+import com.asyncapi.v2.ServerValue;
+import com.asyncapi.v2.ServerVariableValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -26,7 +39,7 @@
 @EqualsAndHashCode
 @NoArgsConstructor
 @AllArgsConstructor
-public class Reference {
+public class Reference implements ChannelBindingValue, CorrelationIdValue, MessageValue, MessageBindingValue, MessageTraitValue, OperationBindingValue, OperationTraitValue, ParameterValue, SchemaValue, SecuritySchemeValue, ServerValue, ServerBindingValue, ServerVariableValue {
 
     /**
      * Required.

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/ChannelItem.java

@@ -1,6 +1,8 @@
 package com.asyncapi.v2._6_0.model.channel;
 
+import com.asyncapi.v2.ChannelBindingValue;
 import com.asyncapi.v2.ExtendableObject;
+import com.asyncapi.v2.ParameterValue;
 import com.asyncapi.v2._6_0.jackson.model.channel.ChannelParametersDeserializer;
 import com.asyncapi.v2._6_0.model.channel.operation.Operation;
 import com.asyncapi.v2.binding.channel.ChannelBinding;
@@ -79,7 +81,7 @@ public class ChannelItem extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = ChannelParametersDeserializer.class)
-    private Map<String, Object> parameters;
+    private Map<String, ParameterValue> parameters;
 
     /**
      * A map where the keys describe the name of the protocol and the values describe protocol-specific definitions for the channel.
@@ -92,6 +94,6 @@ public class ChannelItem extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = ChannelBindingsDeserializer.class)
-    private Map<String, Object> bindings;
+    private Map<String, ChannelBindingValue> bindings;
 
 }

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/Parameter.java

@@ -1,6 +1,7 @@
 package com.asyncapi.v2._6_0.model.channel;
 
 import com.asyncapi.v2.ExtendableObject;
+import com.asyncapi.v2.ParameterValue;
 import com.asyncapi.v2._6_0.jackson.model.schema.SchemaDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.AllArgsConstructor;
@@ -22,7 +23,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class Parameter extends ExtendableObject {
+public class Parameter extends ExtendableObject implements ParameterValue {
 
     /**
      * A verbose explanation of the parameter. <a href="https://spec.commonmark.org/">CommonMark syntax</a> can be used for rich text representation.

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/CorrelationId.java

@@ -1,5 +1,6 @@
 package com.asyncapi.v2._6_0.model.channel.message;
 
+import com.asyncapi.v2.CorrelationIdValue;
 import com.asyncapi.v2.ExtendableObject;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -23,7 +24,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class CorrelationId extends ExtendableObject {
+public class CorrelationId extends ExtendableObject implements CorrelationIdValue {
 
     /**
      * An optional description of the identifier. <a href="https://spec.commonmark.org/">CommonMark syntax</a> can be used for rich text representation.

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/Message.java

@@ -1,6 +1,9 @@
 package com.asyncapi.v2._6_0.model.channel.message;
 
 import com.asyncapi.v2.ExtendableObject;
+import com.asyncapi.v2.MessageBindingValue;
+import com.asyncapi.v2.MessageTraitValue;
+import com.asyncapi.v2.MessageValue;
 import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer;
 import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer;
 import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagePayloadDeserializer;
@@ -32,7 +35,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class Message extends ExtendableObject {
+public class Message extends ExtendableObject implements MessageValue {
 
     /**
      * Unique string used to identify the message.
@@ -155,7 +158,7 @@ public class Message extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = MessageBindingsDeserializer.class)
-    private Map<String, Object> bindings;
+    private Map<String, MessageBindingValue> bindings;
 
     /**
      * List of examples.
@@ -176,6 +179,5 @@ public class Message extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = MessageTraitsDeserializer.class)
-    private List<Object> traits;
-
+    private List<MessageTraitValue> traits;
 }

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/MessageTrait.java

@@ -1,6 +1,8 @@
 package com.asyncapi.v2._6_0.model.channel.message;
 
 import com.asyncapi.v2.ExtendableObject;
+import com.asyncapi.v2.MessageBindingValue;
+import com.asyncapi.v2.MessageTraitValue;
 import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageCorrelationIdDeserializer;
 import com.asyncapi.v2._6_0.jackson.model.channel.message.MessageHeadersDeserializer;
 import com.asyncapi.v2._6_0.model.ExternalDocumentation;
@@ -36,7 +38,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class MessageTrait extends ExtendableObject {
+public class MessageTrait extends ExtendableObject implements MessageTraitValue {
 
     /**
      * Unique string used to identify the message.
@@ -145,7 +147,7 @@ public class MessageTrait extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = MessageBindingsDeserializer.class)
-    private Map<String, Object> bindings;
+    private Map<String, MessageBindingValue> bindings;
 
     /**
      * List of examples.

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/message/OneOfMessages.java

@@ -1,5 +1,6 @@
 package com.asyncapi.v2._6_0.model.channel.message;
 
+import com.asyncapi.v2.MessageValue;
 import com.asyncapi.v2._6_0.jackson.model.channel.message.MessagesDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.AllArgsConstructor;
@@ -31,6 +32,6 @@ public class OneOfMessages {
      */
     @NotNull
     @JsonDeserialize(using = MessagesDeserializer.class)
-    private List<Object> oneOf;
+    private List<MessageValue> oneOf;
 
 }

asyncapi-core/src/main/java/com/asyncapi/v2/_6_0/model/channel/operation/Operation.java

@@ -1,6 +1,8 @@
 package com.asyncapi.v2._6_0.model.channel.operation;
 
 import com.asyncapi.v2.ExtendableObject;
+import com.asyncapi.v2.OperationBindingValue;
+import com.asyncapi.v2.OperationTraitValue;
 import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationMessageDeserializer;
 import com.asyncapi.v2._6_0.jackson.model.channel.operation.OperationTraitsDeserializer;
 import com.asyncapi.v2._6_0.model.ExternalDocumentation;
@@ -93,7 +95,7 @@ public class Operation extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = OperationBindingsDeserializer.class)
-    private Map<String, Object> bindings;
+    private Map<String, OperationBindingValue> bindings;
 
     /**
      * A list of traits to apply to the operation object.
@@ -107,7 +109,7 @@ public class Operation extends ExtendableObject {
      */
     @Nullable
     @JsonDeserialize(using = OperationTraitsDeserializer.class)
-    private List<Object> traits;
+    private List<OperationTraitValue> traits;
 
     /**
      * A definition of the message that will be published or received by this operation.
@@ -124,5 +126,4 @@ public class Operation extends ExtendableObject {
     @Nullable
     @JsonDeserialize(using = OperationMessageDeserializer.class)
     private Object message;
-
 }