diff --git a/README.md b/README.md index 1c04d99..ffc1ded 100644 --- a/README.md +++ b/README.md @@ -45,12 +45,12 @@ gatling("ru.tinkoff:gatling-amqp-plugin_2.13:") ### 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) \ No newline at end of file +* 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) \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 6a9f038..46e43a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.3 +sbt.version=1.8.2 diff --git a/src/main/java/ru/tinkoff/gatling/javaapi/AmqpDsl.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/AmqpDsl.java similarity index 70% rename from src/main/java/ru/tinkoff/gatling/javaapi/AmqpDsl.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/AmqpDsl.java index 55d289e..0145269 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/AmqpDsl.java +++ b/src/main/java/ru/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/src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpCheckType.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/AmqpCheckType.java similarity index 73% rename from src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpCheckType.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/AmqpCheckType.java index 2170a5d..f0187a6 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpCheckType.java +++ b/src/main/java/ru/tinkoff/gatling/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/src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpChecks.scala b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/AmqpChecks.scala similarity index 98% rename from src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpChecks.scala rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/AmqpChecks.scala index 8a7df47..6a446d9 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpChecks.scala +++ b/src/main/java/ru/tinkoff/gatling/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/src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpResponseCodeBuilder.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/AmqpResponseCodeBuilder.java similarity index 93% rename from src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpResponseCodeBuilder.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/AmqpResponseCodeBuilder.java index 203ad9f..ad9e6e5 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/check/AmqpResponseCodeBuilder.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/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/src/main/java/ru/tinkoff/gatling/javaapi/check/ExtendedCheckBuilder.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/ExtendedCheckBuilder.java similarity index 94% rename from src/main/java/ru/tinkoff/gatling/javaapi/check/ExtendedCheckBuilder.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/check/ExtendedCheckBuilder.java index 5bea474..b7a176b 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/check/ExtendedCheckBuilder.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/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/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpExchange.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpExchange.java similarity index 95% rename from src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpExchange.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpExchange.java index 8dddb46..5e95911 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpExchange.java +++ b/src/main/java/ru/tinkoff/gatling/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/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpProtocolBuilder.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpProtocolBuilder.java similarity index 98% rename from src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpProtocolBuilder.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpProtocolBuilder.java index a579c86..9840547 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpProtocolBuilder.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/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/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpProtocolBuilderBase.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpProtocolBuilderBase.java similarity index 92% rename from src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpProtocolBuilderBase.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpProtocolBuilderBase.java index fc7eeac..ba43204 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpProtocolBuilderBase.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/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/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpQueue.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpQueue.java similarity index 94% rename from src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpQueue.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/AmqpQueue.java index d521e91..1c5b44c 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/protocol/AmqpQueue.java +++ b/src/main/java/ru/tinkoff/gatling/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/src/main/java/ru/tinkoff/gatling/javaapi/protocol/RabbitMQConnectionFactoryBuilder.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/RabbitMQConnectionFactoryBuilder.java similarity index 95% rename from src/main/java/ru/tinkoff/gatling/javaapi/protocol/RabbitMQConnectionFactoryBuilder.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/RabbitMQConnectionFactoryBuilder.java index d097732..1e409d0 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/protocol/RabbitMQConnectionFactoryBuilder.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/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/src/main/java/ru/tinkoff/gatling/javaapi/protocol/RabbitMQConnectionFactoryBuilderBase.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/RabbitMQConnectionFactoryBuilderBase.java similarity index 86% rename from src/main/java/ru/tinkoff/gatling/javaapi/protocol/RabbitMQConnectionFactoryBuilderBase.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/RabbitMQConnectionFactoryBuilderBase.java index 464cc9c..041c66c 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/protocol/RabbitMQConnectionFactoryBuilderBase.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/protocol/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/src/main/java/ru/tinkoff/gatling/javaapi/request/AmqpDslBuilderBase.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/AmqpDslBuilderBase.java similarity index 92% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/AmqpDslBuilderBase.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/AmqpDslBuilderBase.java index c64da97..ea83831 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/AmqpDslBuilderBase.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/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/src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilder.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/PublishDslBuilder.java similarity index 98% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilder.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/PublishDslBuilder.java index c2bad72..8947f02 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilder.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/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/src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilderExchange.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/PublishDslBuilderExchange.java similarity index 95% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilderExchange.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/PublishDslBuilderExchange.java index 34ae256..3a08013 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilderExchange.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/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/src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilderMessage.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/PublishDslBuilderMessage.java similarity index 93% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilderMessage.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/PublishDslBuilderMessage.java index 1cebe4a..086e773 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/PublishDslBuilderMessage.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/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/src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilder.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/RequestReplyDslBuilder.java similarity index 96% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilder.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/RequestReplyDslBuilder.java index d7ad058..f49b992 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilder.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/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/src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilderExchange.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/RequestReplyDslBuilderExchange.java similarity index 95% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilderExchange.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/RequestReplyDslBuilderExchange.java index 6e6582d..86737ce 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilderExchange.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/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/src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilderMessage.java b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/RequestReplyDslBuilderMessage.java similarity index 96% rename from src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilderMessage.java rename to src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/RequestReplyDslBuilderMessage.java index 0d66442..625282d 100644 --- a/src/main/java/ru/tinkoff/gatling/javaapi/request/RequestReplyDslBuilderMessage.java +++ b/src/main/java/ru/tinkoff/gatling/amqp/javaapi/request/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/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.java b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/PublishExample.java similarity index 85% rename from src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.java rename to src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/PublishExample.java index efb8504..386d035 100644 --- a/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.java +++ b/src/test/java/ru/tinkoff/gatling/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/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.java b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyExample.java similarity index 89% rename from src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.java rename to src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyExample.java index d30ecdb..12a654f 100644 --- a/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.java +++ b/src/test/java/ru/tinkoff/gatling/amqp/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/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.java b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyTwoBrokerExample.java similarity index 94% rename from src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.java rename to src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyTwoBrokerExample.java index 96e4fe8..0c83f15 100644 --- a/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.java +++ b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/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/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyWithOwnMatchingExample.java b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyWithOwnMatchingExample.java similarity index 93% rename from src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyWithOwnMatchingExample.java rename to src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyWithOwnMatchingExample.java index 729cd94..55f3a4f 100644 --- a/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyWithOwnMatchingExample.java +++ b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/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/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/Utils.java b/src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/Utils.java similarity index 90% rename from src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/Utils.java rename to src/test/java/ru/tinkoff/gatling/amqp/javaapi/examples/Utils.java index a3c8c10..f25e636 100644 --- a/src/test/java/ru/tinkoff/gatling/javaapi/amqp/examples/Utils.java +++ b/src/test/java/ru/tinkoff/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/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.kt b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/PublishExample.kt similarity index 87% rename from src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.kt rename to src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/PublishExample.kt index 8308557..414998b 100644 --- a/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/PublishExample.kt +++ b/src/test/kotlin/ru/tinkoff/gatling/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/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.kt b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyExample.kt similarity index 93% rename from src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.kt rename to src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyExample.kt index edab68c..36438aa 100644 --- a/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyExample.kt +++ b/src/test/kotlin/ru/tinkoff/gatling/amqp/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/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.kt b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyTwoBrokerExample.kt similarity index 92% rename from src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.kt rename to src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyTwoBrokerExample.kt index aad7bc5..3809824 100644 --- a/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyTwoBrokerExample.kt +++ b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/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/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyWithOwnMatchingExample.kt b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyWithOwnMatchingExample.kt similarity index 95% rename from src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyWithOwnMatchingExample.kt rename to src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/RequestReplyWithOwnMatchingExample.kt index 58221ba..4327be2 100644 --- a/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/RequestReplyWithOwnMatchingExample.kt +++ b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/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/src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/Utils.kt b/src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/Utils.kt similarity index 100% rename from src/test/kotlin/ru/tinkoff/gatling/javaapi/amqp/examples/Utils.kt rename to src/test/kotlin/ru/tinkoff/gatling/amqp/javaapi/examples/Utils.kt