[TH2-2806] Initial commit #1

tatianavvedenskaya · 2021-12-23T07:59:09Z

No description provided.

Nikita-Smirnov-Exactpro

Implement the IProtocolHandlerFactory interface that the core part can be able to load and create your handler via SrviceLoader.

Nikita-Smirnov-Exactpro · 2021-12-24T08:00:31Z

gradle.properties

@@ -0,0 +1 @@
+release_version=0.0.0


Suggested change

release_version=0.0.0

release_version=0.0.1

Nikita-Smirnov-Exactpro · 2021-12-24T08:03:49Z

Dockerfile

@@ -0,0 +1,9 @@
+FROM gradle:6.6-jdk11 AS build


Suggested change

FROM gradle:6.6-jdk11 AS build

FROM gradle:7.1.0-jdk11 AS build

Use the same version as gradle-wrapper.properties

Nikita-Smirnov-Exactpro · 2021-12-24T08:05:59Z

build.gradle

+ */
+
+plugins {
+    id 'com.palantir.docker' version '0.25.0'


Try to migrate to the 0.31.0 version

Nikita-Smirnov-Exactpro · 2021-12-24T08:07:27Z

build.gradle

+ext {
+    sharedDir = file("${project.rootDir}/shared")
+    sailfishVersion = '3.2.1594'
+}


Exclude redundant properties

Nikita-Smirnov-Exactpro · 2021-12-24T08:07:45Z

build.gradle

+    sailfishVersion = '3.2.1594'
+}
+
+group 'org.example'


Suggested change

group 'org.example'

group 'com.exactpro.th2'

Nikita-Smirnov-Exactpro · 2021-12-24T08:39:40Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+
+    private var serverFuture: Future<*>? = null
+
+    private lateinit var receivedHeartbeatCommand: Runnable


The same advice as for sentHeartbeatCommand.

Nikita-Smirnov-Exactpro · 2021-12-24T08:48:31Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+
+    fun initCommand(){
+        if(settings.heartbeatInterval <= 0L) {
+            throw Exception("Heartbeat sending interval must be greater than zero")


Suggested change

throw Exception("Heartbeat sending interval must be greater than zero")

error("Heartbeat sending interval must be greater than zero")

Nikita-Smirnov-Exactpro · 2021-12-24T08:51:33Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+    private lateinit var streamId: StreamIdEncode
+
+    fun initCommand(){
+        if(settings.heartbeatInterval <= 0L) {


Execute all checks in the init block to verify all incoming parameters only once at constructing an instance of a class.
https://kotlinlang.org/docs/classes.html#constructors

Nikita-Smirnov-Exactpro · 2021-12-24T08:52:45Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+
+    private lateinit var receivedHeartbeatCommand: Runnable
+
+    private lateinit var streamId: StreamIdEncode


Use @volatile annotation for a variable with immutable value
https://www.baeldung.com/kotlin/volatile-properties

Nikita-Smirnov-Exactpro · 2021-12-24T08:58:55Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+class PillarHandler(private val channel: Channel): IProtocolHandler {
+    private val logger = KotlinLogging.logger {}
+
+    private var state = State.SESSION_CLOSE


Use the AtomicReference for this class variable. It will be useful to control switching between states using compareAnd... methods in concurrent execution.

…PillarHandler, PillarMessageDecoder, TestHandler, add PillarHandlerFactory

cordwelt

Review WIP

cordwelt · 2021-12-24T12:23:04Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+class PillarHandler(private val channel: Channel,
+                    private val settings: PillarHandlerSettings): IProtocolHandler {
+    companion object {
+        private val logger = KotlinLogging.logger { }


Suggested change

private val logger = KotlinLogging.logger { }

private val LOGGER = KotlinLogging.logger {}

cordwelt · 2021-12-24T12:27:17Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicReference
+
+class PillarHandler(private val channel: Channel,


Suggested change

class PillarHandler(private val channel: Channel,

class PillarHandler(private val channel: IChannel,

cordwelt · 2021-12-24T12:28:47Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt

+    override val name: String
+        get() = PillarHandlerSettings::class.java.name


Suggested change

override val name: String

get() = PillarHandlerSettings::class.java.name

override val name: String = PillarHandlerSettings::class.java.name

cordwelt · 2021-12-24T12:28:56Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt

+    override val settings: Class<out IProtocolHandlerSettings>
+        get() = PillarHandlerSettings::class.java


Suggested change

override val settings: Class<out IProtocolHandlerSettings>

get() = PillarHandlerSettings::class.java

override val settings: Class<out IProtocolHandlerSettings> = PillarHandlerSettings::class.java

cordwelt · 2021-12-24T12:29:05Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt

+        get() = PillarHandlerSettings::class.java
+
+    override fun create(context: IContext<IProtocolHandlerSettings>): IProtocolHandler {
+        return PillarHandler(context.channel as Channel, context.settings as PillarHandlerSettings)


Suggested change

return PillarHandler(context.channel as Channel, context.settings as PillarHandlerSettings)

return PillarHandler(context.channel, context.settings as PillarHandlerSettings)

cordwelt · 2021-12-24T13:29:19Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+                channel.open()
+
+                val login = Login(settings)
+                channel.send(login.login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE)


messageMetadata(MessageType.LOGIN)

Can be cached alongside login object (or inside of it)

cordwelt · 2021-12-24T13:30:21Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+        val messageType = buffer.readShort().toInt()
+        val messageLength = buffer.readShort().toInt()


Use must check that there're enough readable bytes before reading something from buffer

cordwelt · 2021-12-24T13:32:53Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+
+        if (!MessageType.contains(messageType)){
+            buffer.resetReaderIndex()
+            error ("Message type is not supported: $messageType")


You should skip the rest of the message, log error and return null instead (or maybe message data). Throwing exception from here would cause channel closure and subsequential reopening

cordwelt · 2021-12-24T13:34:13Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+            return null
+        }
+
+        if(bufferLength > messageLength) {


Suggested change

if(bufferLength > messageLength) {

if(bufferLength >= messageLength) {

cordwelt · 2021-12-24T13:34:53Z

src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt

+            val buf: ByteBuf = Unpooled.buffer(messageLength)
+            buffer.resetReaderIndex()
+            buf.writeBytes(buffer, 0, messageLength)
+            buffer.readerIndex(messageLength)


Slice of the current buffer can be returned instead

…illarMessageDecoder, PillarMessageEncoder, PillarUtils, TestHandler

…coder, PillarUtils, TestHandler

…y.kt, TestHandler.kt

…sageEncoder.kt, TestHandler.kt

…, fixed encoder and decoder

[TH2-2806] Initial commit

28e091f

tatianavvedenskaya requested a review from Nikita-Smirnov-Exactpro December 23, 2021 07:59

tatianavvedenskaya self-assigned this Dec 23, 2021

Татьяна Введенская added 3 commits December 23, 2021 16:47

[TH2-2806] Creating a special assembly

f7a5c78

[TH2-2806] Creating a special assembly

014a399

[TH2-2806] Creating a special assembly

2d9c752

Nikita-Smirnov-Exactpro requested changes Dec 24, 2021

View reviewed changes

Nikita-Smirnov-Exactpro requested a review from cordwelt December 24, 2021 11:39

[TH2-2806] Update build.gradle, Dockerfile, gradle.properties, fixes …

94b9dbd

…PillarHandler, PillarMessageDecoder, TestHandler, add PillarHandlerFactory

cordwelt reviewed Dec 24, 2021

View reviewed changes

Татьяна Введенская and others added 20 commits December 27, 2021 16:42

[TH2-2806] Fixes build.gradle, PillarHandler, PillarHandlerFactory, P…

9a46dd9

…illarMessageDecoder, PillarMessageEncoder, PillarUtils, TestHandler

[TH2-2806] Fixes PillarHandler, PillarMessageDecoder, PillarMessageEn…

b1b0def

…coder, PillarUtils, TestHandler

[TH2-2806] Changing project name

a66f17f

[TH2-2806] Changing project name

9cf14bf

Update build.gradle

37b28fc

Update build.gradle

e74d600

Update build.gradle

b4b8450

Update PillarHandlerFactory.kt

23c676d

[TH2-2806]Update build.gradle

0a9437c

[TH2-2806] Update build.gradle, PillarHandler.kt, PillarHandlerFactor…

ee991ef

…y.kt, TestHandler.kt

[TH2-2806] Update PillarHandlerFactory.kt

3d2d143

[TH2-2806] fixed build.gradle, TestHandler.kt

917db07

[TH2-2806] Fixed PillarHandler.kt

50538bb

[TH2-2806] Fixed PillarHandler.kt

4800b3b

[TH2-2806] Fixed PillarHandler.kt, TestHandler.kt

b53d358

[TH2-2806] Fixed PillarHandler.kt, PillarMessageDecoder.kt, PillarMes…

b7ca861

…sageEncoder.kt, TestHandler.kt

[TH2-2806] Add reconnect

6d3a33a

[TH2-2806] Fixed reconnect

04d981c

[TH2-2806] Fixed heartbeat

30229cf

[TH2-2806] Fixed heartbeat, decoder

4b2637e

Татьяна Введенская and others added 24 commits January 16, 2022 12:39

[TH2-2806] Fixed PillarHandler, TestHandler

c138580

[TH2-2806] Fixed PillarHandler

4f3463c

[TH2-2806] Fixed PillarHandler, PillarMessageDecoder, TestHandler

ce87b1e

[TH2-2806] Fixed State

664a853

[TH2-2806] Fixed PillarHandler

829493b

[TH2-2806] Fixed PillarHandler

13536f3

[TH2-2806] Fixed PillarHandler, TestHandler

0de0d39

[TH2-2806] Fixed PillarMessageEncoder

6476151

[TH2-2806] Fixed PillarHandler

b672813

[TH2-2806] Fixed PillarHandler

30e390f

[TH2-2806] Fixed PillarHandler, PillarMessageDecoder

a4b7199

[TH2-2806] Fixed PillarHandler

34465f8

[TH2-2806] Fixed PillarHandler

a4025aa

[TH2-2806] Fixed PillarHandler, PillarMessageEncoder, TestHandler

ea93355

[TH2-2806] Plugin changes

ed59ab7

[TH2-2806] Plugin changes, fixed onOutgoing and onIncoming in handler…

9979c7b

…, fixed encoder and decoder

Fixed test

906c695

[TH2-2806] Fixed open and close stream, encode and decode SeqMsg

99240ea

[TH2-2806] Plugin changes

e113646

[TH2-2806] Fixed encoder

322b803

[TH2-2806] Fixed handler

eb4252b

[TH2-2806] Fixed open and close session

fe2edab

[TH2-2806] Fixed test

570867d

[TH2-2806] Fixed onReceive and seqNum

195a182

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TH2-2806] Initial commit #1

[TH2-2806] Initial commit #1

tatianavvedenskaya commented Dec 23, 2021

Nikita-Smirnov-Exactpro left a comment

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

Nikita-Smirnov-Exactpro Dec 24, 2021

cordwelt left a comment

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

cordwelt Dec 24, 2021

	FROM gradle:6.6-jdk11 AS build
	FROM gradle:7.1.0-jdk11 AS build


		private var serverFuture: Future<*>? = null

		private lateinit var receivedHeartbeatCommand: Runnable

	throw Exception("Heartbeat sending interval must be greater than zero")
	error("Heartbeat sending interval must be greater than zero")


		private lateinit var receivedHeartbeatCommand: Runnable

		private lateinit var streamId: StreamIdEncode

	private val logger = KotlinLogging.logger { }
	private val LOGGER = KotlinLogging.logger {}

	class PillarHandler(private val channel: Channel,
	class PillarHandler(private val channel: IChannel,

		override val name: String
		get() = PillarHandlerSettings::class.java.name

	override val name: String
	get() = PillarHandlerSettings::class.java.name
	override val name: String = PillarHandlerSettings::class.java.name

		override val settings: Class<out IProtocolHandlerSettings>
		get() = PillarHandlerSettings::class.java

	return PillarHandler(context.channel as Channel, context.settings as PillarHandlerSettings)
	return PillarHandler(context.channel, context.settings as PillarHandlerSettings)

		val messageType = buffer.readShort().toInt()
		val messageLength = buffer.readShort().toInt()

	if(bufferLength > messageLength) {
	if(bufferLength >= messageLength) {

[TH2-2806] Initial commit #1

Are you sure you want to change the base?

[TH2-2806] Initial commit #1

Conversation

tatianavvedenskaya commented Dec 23, 2021

Nikita-Smirnov-Exactpro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cordwelt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment