Skip to content

Commit

Permalink
feat(bindings): use common bindings deserializer
Browse files Browse the repository at this point in the history
  • Loading branch information
Pakisan committed Apr 22, 2024
1 parent 3d94ee2 commit 3475966
Show file tree
Hide file tree
Showing 177 changed files with 798 additions and 866 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asyncapi.v3;
package com.asyncapi;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asyncapi.v2.jackson;
package com.asyncapi.bindings;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.asyncapi.v3.jackson.binding.channel;
package com.asyncapi.bindings;

import com.asyncapi.v3.Reference;
import com.asyncapi.bindings.amqp.v0._2_0.channel.AMQPChannelBinding;
import com.asyncapi.bindings.amqp1.v0._1_0.channel.AMQP1ChannelBinding;
import com.asyncapi.bindings.anypointmq.v0._0_1.channel.AnypointMQChannelBinding;
Expand All @@ -20,7 +19,7 @@
import com.asyncapi.bindings.sqs.v0._1_0.channel.SQSChannelBinding;
import com.asyncapi.bindings.stomp.v0._1_0.channel.STOMPChannelBinding;
import com.asyncapi.bindings.websockets.v0._1_0.channel.WebSocketsChannelBinding;
import com.asyncapi.v3.jackson.BindingsMapDeserializer;
import com.asyncapi.Reference;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.JsonNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.asyncapi.v3.jackson.binding.message;
package com.asyncapi.bindings;

import com.asyncapi.v3.Reference;
import com.asyncapi.bindings.amqp.v0._2_0.message.AMQPMessageBinding;
import com.asyncapi.bindings.amqp1.v0._1_0.message.AMQP1MessageBinding;
import com.asyncapi.bindings.anypointmq.v0._0_1.message.AnypointMQMessageBinding;
Expand All @@ -20,7 +19,7 @@
import com.asyncapi.bindings.sqs.v0._1_0.message.SQSMessageBinding;
import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding;
import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding;
import com.asyncapi.v3.jackson.BindingsMapDeserializer;
import com.asyncapi.Reference;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.JsonNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.asyncapi.v3.jackson.binding.operation;
package com.asyncapi.bindings;

import com.asyncapi.v3.Reference;
import com.asyncapi.bindings.amqp.v0._2_0.operation.AMQPOperationBinding;
import com.asyncapi.bindings.amqp1.v0._1_0.operation.AMQP1OperationBinding;
import com.asyncapi.bindings.anypointmq.v0._0_1.operation.AnypointMQOperationBinding;
Expand All @@ -20,7 +19,7 @@
import com.asyncapi.bindings.sqs.v0._1_0.operation.SQSOperationBinding;
import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding;
import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding;
import com.asyncapi.v3.jackson.BindingsMapDeserializer;
import com.asyncapi.Reference;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.JsonNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.asyncapi.v3.jackson.binding.server;
package com.asyncapi.bindings;

import com.asyncapi.v3.Reference;
import com.asyncapi.bindings.amqp.v0._2_0.server.AMQPServerBinding;
import com.asyncapi.bindings.amqp1.v0._1_0.server.AMQP1ServerBinding;
import com.asyncapi.bindings.anypointmq.v0._0_1.server.AnypointMQServerBinding;
Expand All @@ -20,7 +19,7 @@
import com.asyncapi.bindings.sqs.v0._1_0.server.SQSServerBinding;
import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding;
import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding;
import com.asyncapi.v3.jackson.BindingsMapDeserializer;
import com.asyncapi.Reference;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.JsonNode;
Expand Down
38 changes: 0 additions & 38 deletions asyncapi-core/src/main/java/com/asyncapi/v2/Reference.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.channel;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.Parameter;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.message.CorrelationId;
import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2.schema.Schema;
import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.message.MessageTrait;
import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.channel.operation;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.message.Message;
import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.channel.operation;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait;
import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.message.Message;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.Parameter;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2.schema.Schema;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._0_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;
import com.asyncapi.v2.security_scheme.SecurityScheme;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.asyncapi.ExtendableObject;
import com.asyncapi.v2._0_0.jackson.model.channel.ChannelParametersDeserializer;
import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.operation.Operation;
import com.asyncapi.bindings.ChannelBinding;
import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer;
import com.asyncapi.bindings.ChannelBindingsDeserializer;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import com.asyncapi.v2._0_0.jackson.model.channel.message.MessagePayloadDeserializer;
import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageTraitsDeserializer;
import com.asyncapi.v2._0_0.model.ExternalDocumentation;
import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.Tag;
import com.asyncapi.v2.schema.Schema;
import com.asyncapi.bindings.MessageBinding;
import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer;
import com.asyncapi.bindings.MessageBindingsDeserializer;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageCorrelationIdDeserializer;
import com.asyncapi.v2._0_0.jackson.model.channel.message.MessageHeadersDeserializer;
import com.asyncapi.v2._0_0.model.ExternalDocumentation;
import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.Tag;
import com.asyncapi.v2._0_0.model.channel.operation.OperationTrait;
import com.asyncapi.v2.schema.Schema;
import com.asyncapi.bindings.MessageBinding;
import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer;
import com.asyncapi.bindings.MessageBindingsDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationMessageDeserializer;
import com.asyncapi.v2._0_0.jackson.model.channel.operation.OperationTraitsDeserializer;
import com.asyncapi.v2._0_0.model.ExternalDocumentation;
import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.Tag;
import com.asyncapi.v2._0_0.model.channel.message.Message;
import com.asyncapi.bindings.OperationBinding;
import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer;
import com.asyncapi.bindings.OperationBindingsDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.asyncapi.v2._0_0.model.Tag;
import com.asyncapi.v2._0_0.model.channel.message.MessageTrait;
import com.asyncapi.bindings.OperationBinding;
import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer;
import com.asyncapi.bindings.OperationBindingsDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.asyncapi.v2._0_0.jackson.model.component.ComponentsParametersDeserializer;
import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSchemasDeserializer;
import com.asyncapi.v2._0_0.jackson.model.component.ComponentsSecuritySchemesDeserializer;
import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._0_0.model.channel.Parameter;
import com.asyncapi.v2._0_0.model.channel.message.CorrelationId;
import com.asyncapi.v2._0_0.model.channel.message.Message;
Expand All @@ -16,10 +16,10 @@
import com.asyncapi.bindings.MessageBinding;
import com.asyncapi.bindings.OperationBinding;
import com.asyncapi.bindings.ServerBinding;
import com.asyncapi.v2.jackson.binding.channel.ChannelBindingsDeserializer;
import com.asyncapi.v2.jackson.binding.message.MessageBindingsDeserializer;
import com.asyncapi.v2.jackson.binding.operation.OperationBindingsDeserializer;
import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer;
import com.asyncapi.bindings.ChannelBindingsDeserializer;
import com.asyncapi.bindings.MessageBindingsDeserializer;
import com.asyncapi.bindings.OperationBindingsDeserializer;
import com.asyncapi.bindings.ServerBindingsDeserializer;
import com.asyncapi.v2.security_scheme.SecurityScheme;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.asyncapi.ExtendableObject;
import com.asyncapi.bindings.ServerBinding;
import com.asyncapi.v2.jackson.binding.server.ServerBindingsDeserializer;
import com.asyncapi.bindings.ServerBindingsDeserializer;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.Parameter;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.CorrelationId;
import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2.schema.Schema;
import com.asyncapi.v2.jackson.ReferenceOrObjectDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.MessageTrait;
import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel.message;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.Message;
import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel.operation;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.Message;
import com.asyncapi.v2._6_0.model.channel.message.OneOfMessages;
import com.fasterxml.jackson.core.JsonParser;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.channel.operation;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait;
import com.asyncapi.v2.jackson.ListOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.CorrelationId;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.MessageTrait;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.message.Message;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.operation.OperationTrait;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v2._6_0.jackson.model.component;

import com.asyncapi.v2.Reference;
import com.asyncapi.Reference;
import com.asyncapi.v2._6_0.model.channel.Parameter;
import com.asyncapi.v2.jackson.MapOfReferencesOrObjectsDeserializer;

Expand Down
Loading

0 comments on commit 3475966

Please sign in to comment.