[TH2-5143] Updated dependencies

README.md

@@ -1,4 +1,4 @@
-# HTTP Codec v0.4.0
+# HTTP Codec v0.5.0
 
 This microservice can encode and decode HTTP messages
 
@@ -129,6 +129,13 @@ It's been verified that Sailfish itself is compatible with versions from BOM and
 
 # Release notes
 
+## 0.5.0
+
++ Updated common: `5.7.2-dev`
++ Updated common-utils: `2.2.2-dev`
++ Updated codec: `5.4.1-dev`
++ Updated sailfish-utils: `4.1.1-dev`
+
 ## 0.4.0
 
 + th2 transport protocol support

build.gradle

@@ -87,11 +87,11 @@ jar {
 dependencies {
     api platform("com.exactpro.th2:bom:4.5.0")
 
-    implementation "com.exactpro.th2:common:5.4.0-dev"
-    implementation "com.exactpro.th2:common-utils:2.2.0-dev"
-    implementation "com.exactpro.th2:codec:5.3.0-new-proto-+"
+    implementation "com.exactpro.th2:common:5.7.2-TH2-5143-+"
+    implementation "com.exactpro.th2:common-utils:2.2.2-dev"
+    implementation "com.exactpro.th2:codec:5.4.1-TH2-5143-+"
 
-    implementation "com.exactpro.th2:sailfish-utils:4.1.0-dev"
+    implementation "com.exactpro.th2:sailfish-utils:4.1.1-dev"
 
     compileOnly "com.google.auto.service:auto-service:1.1.1"
     annotationProcessor "com.google.auto.service:auto-service:1.1.1"

gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlin_version=1.8.22
-release_version=0.4.0
+release_version=0.5.0

src/main/kotlin/com/exactpro/th2/codec/http/HttpPipelineCodec.kt

@@ -17,6 +17,7 @@
 package com.exactpro.th2.codec.http
 
 import com.exactpro.th2.codec.api.IPipelineCodec
+import com.exactpro.th2.codec.api.IReportingContext
 import com.exactpro.th2.codec.http.HttpPipelineCodecFactory.Companion.PROTOCOL
 import com.exactpro.th2.common.grpc.AnyMessage.KindCase.MESSAGE
 import com.exactpro.th2.common.grpc.AnyMessage.KindCase.RAW_MESSAGE
@@ -57,7 +58,7 @@ import com.exactpro.th2.common.grpc.RawMessage as ProtoRawMessage
 
 class HttpPipelineCodec : IPipelineCodec {
 
-    override fun encode(messageGroup: ProtoMessageGroup): ProtoMessageGroup {
+    override fun encode(messageGroup: ProtoMessageGroup, context: IReportingContext): ProtoMessageGroup {
         val messages = messageGroup.messagesList
 
         require(messages.size <= 2) { "Message group must contain at most 2 messages" }
@@ -131,7 +132,7 @@ class HttpPipelineCodec : IPipelineCodec {
         return builder.build()
     }
 
-    override fun encode(messageGroup: MessageGroup): MessageGroup {
+    override fun encode(messageGroup: MessageGroup, context: IReportingContext): MessageGroup {
         val messages = messageGroup.messages
 
         require(messages.size <= 2) { "Message group must contain at most 2 messages" }
@@ -201,7 +202,7 @@ class HttpPipelineCodec : IPipelineCodec {
         return MessageGroup(encodedMessages)
     }
 
-    override fun decode(messageGroup: ProtoMessageGroup): ProtoMessageGroup {
+    override fun decode(messageGroup: ProtoMessageGroup, context: IReportingContext): ProtoMessageGroup {
         val messages = messageGroup.messagesList
 
         require(messages.size == 1) { "Message group must contain only 1 message" }
@@ -231,7 +232,7 @@ class HttpPipelineCodec : IPipelineCodec {
         return builder.build()
     }
 
-    override fun decode(messageGroup: MessageGroup): MessageGroup {
+    override fun decode(messageGroup: MessageGroup, context: IReportingContext): MessageGroup {
         val messages = messageGroup.messages
 
         require(messages.size == 1) { "Message group must contain only 1 message" }

src/main/kotlin/com/exactpro/th2/codec/http/HttpPipelineCodecFactory.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2020-2023 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@ import com.google.auto.service.AutoService
 @AutoService(IPipelineCodecFactory::class)
 class HttpPipelineCodecFactory : IPipelineCodecFactory {
     override val settingsClass: Class<out IPipelineCodecSettings> = HttpPipelineCodecSettings::class.java
-    @Deprecated("Please migrate to the protocols property")
-    override val protocol: String = PROTOCOL
+    override val protocols: Set<String> get() = PROTOCOLS
     override fun init(pipelineCodecContext: IPipelineCodecContext) = Unit
     override fun create(settings: IPipelineCodecSettings?): IPipelineCodec = HttpPipelineCodec()
 
     companion object {
         const val PROTOCOL = "http"
+        private val PROTOCOLS = setOf(PROTOCOL)
     }
 }

src/test/kotlin/com/exactpro/th2/codec/http/DecodeTest.kt

@@ -16,6 +16,7 @@
 
 package com.exactpro.th2.codec.http
 
+import com.exactpro.th2.codec.api.impl.ReportingContext
 import com.exactpro.th2.codec.http.HttpPipelineCodecFactory.Companion.PROTOCOL
 import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.RawMessage
 import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage
@@ -58,7 +59,7 @@ class DecodeTest {
 
         val messageGroup = ProtoMessageGroup.newBuilder().addMessages(ProtoAnyMessage.newBuilder().setRawMessage(message).build()).build()
 
-        val decodedEventID = codec.decode(messageGroup).getMessages(0).message.parentEventId
+        val decodedEventID = codec.decode(messageGroup, ReportingContext()).getMessages(0).message.parentEventId
 
         assertEquals(eventID, decodedEventID.id)
     }
@@ -84,7 +85,7 @@ class DecodeTest {
 
         val messageGroup = ProtoMessageGroup.newBuilder().addMessages(ProtoAnyMessage.newBuilder().setRawMessage(message).build()).build()
 
-        val decodedEventID = codec.decode(messageGroup).getMessages(0).message.parentEventId
+        val decodedEventID = codec.decode(messageGroup, ReportingContext()).getMessages(0).message.parentEventId
 
         assertEquals(eventID, decodedEventID.id)
     }
@@ -110,7 +111,7 @@ class DecodeTest {
 
         val messageGroup = MessageGroup(listOf(message))
 
-        val decodedGroup = codec.decode(messageGroup)
+        val decodedGroup = codec.decode(messageGroup, ReportingContext())
 
         val decodedMessage = decodedGroup.messages[0] as ParsedMessage
 
@@ -151,7 +152,7 @@ class DecodeTest {
 
         val messageGroup = MessageGroup(listOf(message))
 
-        val decodedGroup = codec.decode(messageGroup)
+        val decodedGroup = codec.decode(messageGroup, ReportingContext())
 
         assertEquals(1, decodedGroup.messages.size)
 

src/test/kotlin/com/exactpro/th2/codec/http/EncodeTest.kt

@@ -16,6 +16,7 @@
 
 package com.exactpro.th2.codec.http
 
+import com.exactpro.th2.codec.api.impl.ReportingContext
 import com.exactpro.th2.codec.http.HttpPipelineCodecFactory.Companion.PROTOCOL
 import com.exactpro.th2.common.grpc.AnyMessage as ProtoAnyMessage
 import com.exactpro.th2.common.grpc.Message as ProtoMessage
@@ -47,7 +48,7 @@ class EncodeTest {
 
         val messageGroup = ProtoMessageGroup.newBuilder().addMessages(ProtoAnyMessage.newBuilder().setMessage(message).build()).build()
 
-        val encodedEventID = codec.encode(messageGroup).getMessages(0).rawMessage.parentEventId
+        val encodedEventID = codec.encode(messageGroup, ReportingContext()).getMessages(0).rawMessage.parentEventId
 
         assertEquals(eventID, encodedEventID.id)
     }
@@ -66,7 +67,7 @@ class EncodeTest {
         }
 
         val messageGroup = ProtoMessageGroup.newBuilder().addMessages(ProtoAnyMessage.newBuilder().setMessage(message).build()).build()
-        val encodedEventID = codec.encode(messageGroup).getMessages(0).rawMessage.parentEventId
+        val encodedEventID = codec.encode(messageGroup, ReportingContext()).getMessages(0).rawMessage.parentEventId
 
         assertEquals(eventID, encodedEventID.id)
     }
@@ -87,7 +88,7 @@ class EncodeTest {
         )
 
         val messageGroup = MessageGroup(listOf(message))
-        val encodedGroup = codec.encode(messageGroup)
+        val encodedGroup = codec.encode(messageGroup, ReportingContext())
         val encodedMessage = encodedGroup.messages[0] as RawMessage
         val encodedEventID = encodedMessage.eventId
 
@@ -113,7 +114,7 @@ class EncodeTest {
         )
 
         val messageGroup = MessageGroup(listOf(message))
-        val encodedGroup = codec.encode(messageGroup)
+        val encodedGroup = codec.encode(messageGroup, ReportingContext())
 
         val encodedMessage = encodedGroup.messages[0] as RawMessage
         val encodedEventID = encodedMessage.eventId