feat(websockets bindings): v2 use common bindings

#184 #183
asyncapi · Apr 21, 2024 · ed57b9c · ed57b9c
1 parent 3e33bec
commit ed57b9c
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 72 deletions.
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/message/ws/WebSocketsMessageBinding.java
diff --git a/...i-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java b/...i-core/src/main/java/com/asyncapi/v2/binding/operation/ws/WebSocketsOperationBinding.java
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java b/asyncapi-core/src/main/java/com/asyncapi/v2/binding/server/ws/WebSocketsServerBinding.java
diff --git a/...re/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java b/...re/src/main/java/com/asyncapi/v2/jackson/binding/message/MessageBindingsDeserializer.java
@@ -19,7 +19,7 @@
 import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding;
 import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding;
 import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding;
-import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding;
+import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.ObjectCodec;

diff --git a/...rc/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java b/...rc/main/java/com/asyncapi/v2/jackson/binding/operation/OperationBindingsDeserializer.java
@@ -19,7 +19,7 @@
 import com.asyncapi.v2.binding.operation.solace.SolaceOperationBinding;
 import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding;
 import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding;
-import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding;
+import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.ObjectCodec;

diff --git a/...core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java b/...core/src/main/java/com/asyncapi/v2/jackson/binding/server/ServerBindingsDeserializer.java
@@ -19,7 +19,7 @@
 import com.asyncapi.v2.binding.server.solace.SolaceServerBinding;
 import com.asyncapi.v2.binding.server.sqs.SQSServerBinding;
 import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding;
-import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding;
+import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding;
 import com.asyncapi.v2.jackson.BindingsMapDeserializer;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.ObjectCodec;

diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTest.kt
@@ -24,7 +24,7 @@ import com.asyncapi.v2.binding.message.sns.SNSMessageBinding
 import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding
 import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding
 import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding
-import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding
+import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding
 
 /**
  * @author Pavel Bodiachevskii

diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/message/MessageTraitTest.kt
@@ -22,7 +22,7 @@ import com.asyncapi.v2.binding.message.sns.SNSMessageBinding
 import com.asyncapi.v2.binding.message.solace.SolaceMessageBinding
 import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding
 import com.asyncapi.bindings.stomp.v0._1_0.message.STOMPMessageBinding
-import com.asyncapi.v2.binding.message.ws.WebSocketsMessageBinding
+import com.asyncapi.bindings.websockets.v0._1_0.message.WebSocketsMessageBinding
 
 /**
  * @author Pavel Bodiachevskii

diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTest.kt
@@ -24,7 +24,7 @@ import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding
 import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest
 import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding
 import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding
-import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding
+import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding
 
 /**
  * @author Pavel Bodiachevskii

diff --git a/...i-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt b/...i-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/channel/operation/OperationTraitTest.kt
@@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.operation.sns.SNSOperationBinding
 import com.asyncapi.v2.binding.operation.solace.SolaceOperationBindingTest
 import com.asyncapi.v2.binding.operation.sqs.SQSOperationBinding
 import com.asyncapi.bindings.stomp.v0._1_0.operation.STOMPOperationBinding
-import com.asyncapi.v2.binding.operation.ws.WebSocketsOperationBinding
+import com.asyncapi.bindings.websockets.v0._1_0.operation.WebSocketsOperationBinding
 
 /**
  * @author Pavel Bodiachevskii

diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_0_0/model/server/ServerTest.kt
@@ -20,7 +20,7 @@ import com.asyncapi.v2.binding.server.sns.SNSServerBinding
 import com.asyncapi.v2.binding.server.solace.SolaceServerBinding
 import com.asyncapi.v2.binding.server.sqs.SQSServerBinding
 import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding
-import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding
+import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding
 
 /**
  * @author Pavel Bodiachevskii

diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/v2/_6_0/model/server/ServerTest.kt
@@ -21,7 +21,7 @@ import com.asyncapi.v2.binding.server.sns.SNSServerBinding
 import com.asyncapi.v2.binding.server.solace.SolaceServerBinding
 import com.asyncapi.v2.binding.server.sqs.SQSServerBinding
 import com.asyncapi.bindings.stomp.v0._1_0.server.STOMPServerBinding
-import com.asyncapi.v2.binding.server.ws.WebSocketsServerBinding
+import com.asyncapi.bindings.websockets.v0._1_0.server.WebSocketsServerBinding
 
 /**
  * @version 2.6.0