Fix package name for java and kotlin (#85)

* fix: package name for java and kotlin * feat: sbt version Co-authored-by: al.terekhov <[email protected]>
Tinkoff · Jan 10, 2023 · 939a8e2 · 939a8e2
1 parent 171785a
commit 939a8e2
Show file tree

Hide file tree

Showing 30 changed files with 59 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -45,12 +45,12 @@ gatling("ru.tinkoff:gatling-amqp-plugin_2.13:<version>")
 
 ### Java
 
-* Example scenario for [publishing](src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.java)
-* Example scenario for [Publish And Reply](src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.java)
-* Example scenario for [Publish and Reply on different message-brokers](src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.java)
+* Example scenario for [publishing](src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/PublishExample.java)
+* Example scenario for [Publish And Reply](src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyExample.java)
+* Example scenario for [Publish and Reply on different message-brokers](src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyTwoBrokerExample.java)
 
 ### Kotlin
 
-* Example scenario for [publishing](src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.kt)
-* Example scenario for [Publish And Reply](src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.kt)
-* Example scenario for [Publish and Reply on different message-brokers](src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.kt)
+* Example scenario for [publishing](src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/PublishExample.kt)
+* Example scenario for [Publish And Reply](src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyExample.kt)
+* Example scenario for [Publish and Reply on different message-brokers](src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyTwoBrokerExample.kt)
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.8.2
diff --git a/...a/ru/tinkoff/gatling/javaapi/AmqpDsl.java → ...tinkoff/gatling/amqp/javaapi/AmqpDsl.java b/...a/ru/tinkoff/gatling/javaapi/AmqpDsl.java → ...tinkoff/gatling/amqp/javaapi/AmqpDsl.java
@@ -1,13 +1,15 @@
-package ru.tinkoff.gatling.javaapi;
+package ru.tinkoff.gatling.amqp.javaapi;
 
 import static io.gatling.javaapi.core.internal.Expressions.*;
 
 import ru.tinkoff.gatling.amqp.checks.AmqpResponseCodeCheckBuilder;
+import ru.tinkoff.gatling.amqp.javaapi.check.ExtendedCheckBuilder;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpProtocolBuilderBase;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.RabbitMQConnectionFactoryBuilderBase;
 import ru.tinkoff.gatling.amqp.request.AmqpProtocolMessage;
-import ru.tinkoff.gatling.javaapi.check.AmqpChecks;
-import ru.tinkoff.gatling.javaapi.check.ExtendedCheckBuilder;
-import ru.tinkoff.gatling.javaapi.protocol.*;
-import ru.tinkoff.gatling.javaapi.request.AmqpDslBuilderBase;
+import ru.tinkoff.gatling.amqp.javaapi.check.AmqpChecks;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.*;
+import ru.tinkoff.gatling.amqp.javaapi.request.AmqpDslBuilderBase;
 import scala.Function1;
 
 public final class AmqpDsl {

diff --git a/.../gatling/javaapi/check/AmqpCheckType.java → ...ing/amqp/javaapi/check/AmqpCheckType.java b/.../gatling/javaapi/check/AmqpCheckType.java → ...ing/amqp/javaapi/check/AmqpCheckType.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.check;
+package ru.tinkoff.gatling.amqp.javaapi.check;
 
 import io.gatling.javaapi.core.CheckBuilder;
 

diff --git a/...ff/gatling/javaapi/check/AmqpChecks.scala → ...tling/amqp/javaapi/check/AmqpChecks.scala b/...ff/gatling/javaapi/check/AmqpChecks.scala → ...tling/amqp/javaapi/check/AmqpChecks.scala
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.check
+package ru.tinkoff.gatling.amqp.javaapi.check
 
 import com.fasterxml.jackson.databind.JsonNode
 import io.gatling.core.check._

diff --git a/...avaapi/check/AmqpResponseCodeBuilder.java → ...avaapi/check/AmqpResponseCodeBuilder.java b/...avaapi/check/AmqpResponseCodeBuilder.java → ...avaapi/check/AmqpResponseCodeBuilder.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.check;
+package ru.tinkoff.gatling.amqp.javaapi.check;
 
 import io.gatling.core.check.CheckBuilder;
 import ru.tinkoff.gatling.amqp.checks.AmqpResponseCodeCheckBuilder.AmqpMessageCheckType;

diff --git a/...g/javaapi/check/ExtendedCheckBuilder.java → ...p/javaapi/check/ExtendedCheckBuilder.java b/...g/javaapi/check/ExtendedCheckBuilder.java → ...p/javaapi/check/ExtendedCheckBuilder.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.check;
+package ru.tinkoff.gatling.amqp.javaapi.check;
 
 import ru.tinkoff.gatling.amqp.checks.AmqpResponseCodeCheckBuilder.*;
 import ru.tinkoff.gatling.amqp.request.AmqpProtocolMessage;

diff --git a/...atling/javaapi/protocol/AmqpExchange.java → ...g/amqp/javaapi/protocol/AmqpExchange.java b/...atling/javaapi/protocol/AmqpExchange.java → ...g/amqp/javaapi/protocol/AmqpExchange.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.protocol;
+package ru.tinkoff.gatling.amqp.javaapi.protocol;
 
 import com.rabbitmq.client.BuiltinExchangeType;
 

diff --git a/...javaapi/protocol/AmqpProtocolBuilder.java → ...javaapi/protocol/AmqpProtocolBuilder.java b/...javaapi/protocol/AmqpProtocolBuilder.java → ...javaapi/protocol/AmqpProtocolBuilder.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.protocol;
+package ru.tinkoff.gatling.amqp.javaapi.protocol;
 
 import io.gatling.core.protocol.Protocol;
 import io.gatling.javaapi.core.ProtocolBuilder;

diff --git a/...api/protocol/AmqpProtocolBuilderBase.java → ...api/protocol/AmqpProtocolBuilderBase.java b/...api/protocol/AmqpProtocolBuilderBase.java → ...api/protocol/AmqpProtocolBuilderBase.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.protocol;
+package ru.tinkoff.gatling.amqp.javaapi.protocol;
 
 import com.rabbitmq.client.ConnectionFactory;
 

diff --git a/...f/gatling/javaapi/protocol/AmqpQueue.java → ...ling/amqp/javaapi/protocol/AmqpQueue.java b/...f/gatling/javaapi/protocol/AmqpQueue.java → ...ling/amqp/javaapi/protocol/AmqpQueue.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.protocol;
+package ru.tinkoff.gatling.amqp.javaapi.protocol;
 
 import java.util.Map;
 

diff --git a/...col/RabbitMQConnectionFactoryBuilder.java → ...col/RabbitMQConnectionFactoryBuilder.java b/...col/RabbitMQConnectionFactoryBuilder.java → ...col/RabbitMQConnectionFactoryBuilder.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.protocol;
+package ru.tinkoff.gatling.amqp.javaapi.protocol;
 
 import com.rabbitmq.client.ConnectionFactory;
 

diff --git a/...RabbitMQConnectionFactoryBuilderBase.java → ...RabbitMQConnectionFactoryBuilderBase.java b/...RabbitMQConnectionFactoryBuilderBase.java → ...RabbitMQConnectionFactoryBuilderBase.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.protocol;
+package ru.tinkoff.gatling.amqp.javaapi.protocol;
 
 import scala.Option;
 

diff --git a/...g/javaapi/request/AmqpDslBuilderBase.java → ...p/javaapi/request/AmqpDslBuilderBase.java b/...g/javaapi/request/AmqpDslBuilderBase.java → ...p/javaapi/request/AmqpDslBuilderBase.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 public final class AmqpDslBuilderBase {
     private final ru.tinkoff.gatling.amqp.request.AmqpDslBuilderBase wrapped;

diff --git a/...ng/javaapi/request/PublishDslBuilder.java → ...qp/javaapi/request/PublishDslBuilder.java b/...ng/javaapi/request/PublishDslBuilder.java → ...qp/javaapi/request/PublishDslBuilder.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 import java.util.Map;
 import static io.gatling.javaapi.core.internal.Expressions.*;

diff --git a/...pi/request/PublishDslBuilderExchange.java → ...pi/request/PublishDslBuilderExchange.java b/...pi/request/PublishDslBuilderExchange.java → ...pi/request/PublishDslBuilderExchange.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 import static io.gatling.javaapi.core.internal.Expressions.*;
 public class PublishDslBuilderExchange {

diff --git a/...api/request/PublishDslBuilderMessage.java → ...api/request/PublishDslBuilderMessage.java b/...api/request/PublishDslBuilderMessage.java → ...api/request/PublishDslBuilderMessage.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 import java.nio.charset.Charset;
 import static io.gatling.javaapi.core.internal.Expressions.*;

diff --git a/...vaapi/request/RequestReplyDslBuilder.java → ...vaapi/request/RequestReplyDslBuilder.java b/...vaapi/request/RequestReplyDslBuilder.java → ...vaapi/request/RequestReplyDslBuilder.java
@@ -1,7 +1,7 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 import io.gatling.javaapi.core.ActionBuilder;
-import ru.tinkoff.gatling.javaapi.check.AmqpChecks;
+import ru.tinkoff.gatling.amqp.javaapi.check.AmqpChecks;
 import scala.Tuple2;
 
 import java.util.Arrays;

diff --git a/...quest/RequestReplyDslBuilderExchange.java → ...quest/RequestReplyDslBuilderExchange.java b/...quest/RequestReplyDslBuilderExchange.java → ...quest/RequestReplyDslBuilderExchange.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 import static io.gatling.javaapi.core.internal.Expressions.*;
 

diff --git a/...equest/RequestReplyDslBuilderMessage.java → ...equest/RequestReplyDslBuilderMessage.java b/...equest/RequestReplyDslBuilderMessage.java → ...equest/RequestReplyDslBuilderMessage.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.request;
+package ru.tinkoff.gatling.amqp.javaapi.request;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;

diff --git a/...javaapi/amqp/examples/PublishExample.java → ...amqp/javaapi/examples/PublishExample.java b/...javaapi/amqp/examples/PublishExample.java → ...amqp/javaapi/examples/PublishExample.java
@@ -1,14 +1,14 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples;
+package ru.tinkoff.gatling.amqp.javaapi.examples;
 
 import io.gatling.javaapi.core.ScenarioBuilder;
 import io.gatling.javaapi.core.Simulation;
-import ru.tinkoff.gatling.javaapi.protocol.AmqpProtocolBuilder;
-import ru.tinkoff.gatling.javaapi.protocol.AmqpQueue;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpProtocolBuilder;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpQueue;
 
 import java.util.Map;
 
 import static io.gatling.javaapi.core.CoreDsl.*;
-import static ru.tinkoff.gatling.javaapi.AmqpDsl.*;
+import static ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*;
 
 public class PublishExample extends Simulation {
 

diff --git a/...pi/amqp/examples/RequestReplyExample.java → ...javaapi/examples/RequestReplyExample.java b/...pi/amqp/examples/RequestReplyExample.java → ...javaapi/examples/RequestReplyExample.java
@@ -1,14 +1,16 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples;
+package ru.tinkoff.gatling.amqp.javaapi.examples;
 
 import com.rabbitmq.client.BuiltinExchangeType;
 import io.gatling.javaapi.core.ScenarioBuilder;
 import io.gatling.javaapi.core.Simulation;
-import ru.tinkoff.gatling.javaapi.protocol.*;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpExchange;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpProtocolBuilder;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpQueue;
 
 import java.util.Map;
 
 import static io.gatling.javaapi.core.CoreDsl.*;
-import static ru.tinkoff.gatling.javaapi.AmqpDsl.*;
+import static ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*;
 
 public class RequestReplyExample extends Simulation {
     private AmqpExchange topic = new AmqpExchange("test_queue_in", BuiltinExchangeType.TOPIC, false, false, Map.of());

diff --git a/...xamples/RequestReplyTwoBrokerExample.java → ...xamples/RequestReplyTwoBrokerExample.java b/...xamples/RequestReplyTwoBrokerExample.java → ...xamples/RequestReplyTwoBrokerExample.java
@@ -1,14 +1,14 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples;
+package ru.tinkoff.gatling.amqp.javaapi.examples;
 
 import io.gatling.javaapi.core.ScenarioBuilder;
 import io.gatling.javaapi.core.Simulation;
 import ru.tinkoff.gatling.amqp.examples.utils.SimpleRabbitMQClient;
-import ru.tinkoff.gatling.javaapi.protocol.*;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpProtocolBuilder;
 
 import java.util.Map;
 
 import static io.gatling.javaapi.core.CoreDsl.*;
-import static ru.tinkoff.gatling.javaapi.AmqpDsl.*;
+import static ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*;
 
 public class RequestReplyTwoBrokerExample extends Simulation {
 

diff --git a/...s/RequestReplyWithOwnMatchingExample.java → ...s/RequestReplyWithOwnMatchingExample.java b/...s/RequestReplyWithOwnMatchingExample.java → ...s/RequestReplyWithOwnMatchingExample.java
@@ -1,14 +1,14 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples;
+package ru.tinkoff.gatling.amqp.javaapi.examples;
 
 import io.gatling.javaapi.core.ScenarioBuilder;
 import io.gatling.javaapi.core.Simulation;
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpProtocolBuilder;
 import ru.tinkoff.gatling.amqp.request.AmqpProtocolMessage;
-import ru.tinkoff.gatling.javaapi.protocol.*;
 
 import java.util.Map;
 
 import static io.gatling.javaapi.core.CoreDsl.*;
-import static ru.tinkoff.gatling.javaapi.AmqpDsl.*;
+import static ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*;
 
 public class RequestReplyWithOwnMatchingExample extends Simulation {
 

diff --git a/.../gatling/javaapi/amqp/examples/Utils.java → .../gatling/amqp/javaapi/examples/Utils.java b/.../gatling/javaapi/amqp/examples/Utils.java → .../gatling/amqp/javaapi/examples/Utils.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples;
+package ru.tinkoff.gatling.amqp.javaapi.examples;
 
 import java.util.Collections;
 import java.util.Iterator;

diff --git a/...g/javaapi/amqp/examples/PublishExample.kt → ...g/amqp/javaapi/examples/PublishExample.kt b/...g/javaapi/amqp/examples/PublishExample.kt → ...g/amqp/javaapi/examples/PublishExample.kt
@@ -1,9 +1,9 @@
-package ru.tinkoff.gatling.javaapi.aqmp.examples
+package ru.tinkoff.gatling.amqp.javaapi.examples
 
 import io.gatling.javaapi.core.CoreDsl.*
 import io.gatling.javaapi.core.*
-import ru.tinkoff.gatling.javaapi.AmqpDsl.*
-import ru.tinkoff.gatling.javaapi.protocol.AmqpProtocolBuilder
+import ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*
+import ru.tinkoff.gatling.amqp.javaapi.protocol.AmqpProtocolBuilder
 
 class PublishExample : Simulation() {
     val amqpConf: AmqpProtocolBuilder = amqp()

diff --git a/...aapi/amqp/examples/RequestReplyExample.kt → ...p/javaapi/examples/RequestReplyExample.kt b/...aapi/amqp/examples/RequestReplyExample.kt → ...p/javaapi/examples/RequestReplyExample.kt
@@ -1,12 +1,12 @@
-package ru.tinkoff.gatling.javaapi.aqmp.examples
+package ru.tinkoff.gatling.amqp.javaapi.examples
 
 import com.rabbitmq.client.BuiltinExchangeType
 import io.gatling.javaapi.core.CoreDsl.*
 import io.gatling.javaapi.core.ScenarioBuilder
 import io.gatling.javaapi.core.Simulation
 import ru.tinkoff.gatling.amqp.request.AmqpProtocolMessage
-import ru.tinkoff.gatling.javaapi.AmqpDsl.*
-import ru.tinkoff.gatling.javaapi.protocol.*
+import ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*
+import ru.tinkoff.gatling.amqp.javaapi.protocol.*
 
 class RequestReplyExample: Simulation(){
     private val topic = AmqpExchange("test_queue_in", BuiltinExchangeType.TOPIC, false, false, mapOf())

diff --git a/.../examples/RequestReplyTwoBrokerExample.kt → .../examples/RequestReplyTwoBrokerExample.kt b/.../examples/RequestReplyTwoBrokerExample.kt → .../examples/RequestReplyTwoBrokerExample.kt
@@ -1,13 +1,11 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples
+package ru.tinkoff.gatling.amqp.javaapi.examples
 
 import io.gatling.javaapi.core.CoreDsl
 import io.gatling.javaapi.core.CoreDsl.*
 import io.gatling.javaapi.core.ScenarioBuilder
 import io.gatling.javaapi.core.Simulation
-import ru.tinkoff.gatling.javaapi.AmqpDsl
-import ru.tinkoff.gatling.javaapi.AmqpDsl.amqp
-import ru.tinkoff.load.cosmos.feeders.Feeders
-
+import ru.tinkoff.gatling.amqp.javaapi.AmqpDsl
+import ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.amqp
 
 class RequestReplyTwoBrokerExample : Simulation() {
     override fun before() {

diff --git a/...les/RequestReplyWithOwnMatchingExample.kt → ...les/RequestReplyWithOwnMatchingExample.kt b/...les/RequestReplyWithOwnMatchingExample.kt → ...les/RequestReplyWithOwnMatchingExample.kt
@@ -1,9 +1,9 @@
-package ru.tinkoff.gatling.javaapi.amqp.examples
+package ru.tinkoff.gatling.amqp.javaapi.examples
 
 import io.gatling.javaapi.core.*
 import io.gatling.javaapi.core.CoreDsl.*
 import ru.tinkoff.gatling.amqp.request.AmqpProtocolMessage
-import ru.tinkoff.gatling.javaapi.AmqpDsl.*
+import ru.tinkoff.gatling.amqp.javaapi.AmqpDsl.*
 
 class RequestReplyWithOwnMatchingExample : Simulation() {
 

diff --git a/...ff/gatling/javaapi/amqp/examples/Utils.kt → ...ff/gatling/amqp/javaapi/examples/Utils.kt b/...ff/gatling/javaapi/amqp/examples/Utils.kt → ...ff/gatling/amqp/javaapi/examples/Utils.kt