diff --git a/eventuate-tram-commands-db-broker-integration-test/build.gradle b/eventuate-tram-commands-db-broker-integration-test/build.gradle index 9297bdc8..4e9df69a 100644 --- a/eventuate-tram-commands-db-broker-integration-test/build.gradle +++ b/eventuate-tram-commands-db-broker-integration-test/build.gradle @@ -2,9 +2,9 @@ apply plugin: PrivateModulePlugin dependencies { compile project(":eventuate-tram-producer-jdbc") - compile project(":eventuate-tram-consumer-jdbc-spring") + compile project(":eventuate-tram-spring-consumer-jdbc") compile project(":eventuate-tram-integration-test-common") - compile project(":eventuate-tram-commands-spring") + compile project(":eventuate-tram-spring-commands") testCompile "io.eventuate.cdc:eventuate-local-java-test-util:$eventuateCdcVersion" testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" diff --git a/eventuate-tram-commands-db-broker-integration-test/src/test/java/io/eventuate/tram/commands/db/broker/integrationtests/TramCommandsDBBrokerIntegrationTestConfiguration.java b/eventuate-tram-commands-db-broker-integration-test/src/test/java/io/eventuate/tram/commands/db/broker/integrationtests/TramCommandsDBBrokerIntegrationTestConfiguration.java index c8667c9e..076bcc40 100644 --- a/eventuate-tram-commands-db-broker-integration-test/src/test/java/io/eventuate/tram/commands/db/broker/integrationtests/TramCommandsDBBrokerIntegrationTestConfiguration.java +++ b/eventuate-tram-commands-db-broker-integration-test/src/test/java/io/eventuate/tram/commands/db/broker/integrationtests/TramCommandsDBBrokerIntegrationTestConfiguration.java @@ -2,9 +2,9 @@ import io.eventuate.tram.commands.consumer.CommandDispatcher; import io.eventuate.tram.commands.consumer.CommandDispatcherFactory; -import io.eventuate.tram.commands.spring.consumer.TramCommandConsumerConfiguration; -import io.eventuate.tram.commands.spring.producer.TramCommandProducerConfiguration; -import io.eventuate.tram.consumer.common.spring.TramNoopDuplicateMessageDetectorConfiguration; +import io.eventuate.tram.spring.commands.consumer.TramCommandConsumerConfiguration; +import io.eventuate.tram.spring.commands.producer.TramCommandProducerConfiguration; +import io.eventuate.tram.spring.consumer.common.TramNoopDuplicateMessageDetectorConfiguration; import io.eventuate.tram.integrationtest.common.TramIntegrationTestMySqlBinlogKafkaConfiguration; import io.eventuate.tram.integrationtest.common.TramIntegrationTestMySqlBinlogRedisConfiguration; import io.eventuate.tram.integrationtest.common.TramIntegrationTestPollingActiveMQConfiguration; diff --git a/eventuate-tram-consumer-activemq/build.gradle b/eventuate-tram-consumer-activemq/build.gradle index ed4f1e1b..488d4886 100644 --- a/eventuate-tram-consumer-activemq/build.gradle +++ b/eventuate-tram-consumer-activemq/build.gradle @@ -2,7 +2,7 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-messaging") - compile project(":eventuate-tram-consumer-common-spring") + compile project(":eventuate-tram-spring-consumer-common") compile "io.eventuate.messaging.activemq:eventuate-messaging-activemq-consumer:$eventuateMessagingActiveMQVersion" } diff --git a/eventuate-tram-consumer-activemq/src/main/java/io/eventuate/tram/consumer/activemq/EventuateTramActiveMQMessageConsumerConfiguration.java b/eventuate-tram-consumer-activemq/src/main/java/io/eventuate/tram/consumer/activemq/EventuateTramActiveMQMessageConsumerConfiguration.java index 00e5381a..3e5f6375 100644 --- a/eventuate-tram-consumer-activemq/src/main/java/io/eventuate/tram/consumer/activemq/EventuateTramActiveMQMessageConsumerConfiguration.java +++ b/eventuate-tram-consumer-activemq/src/main/java/io/eventuate/tram/consumer/activemq/EventuateTramActiveMQMessageConsumerConfiguration.java @@ -3,7 +3,7 @@ import io.eventuate.messaging.activemq.consumer.MessageConsumerActiveMQConfiguration; import io.eventuate.messaging.activemq.consumer.MessageConsumerActiveMQImpl; import io.eventuate.tram.consumer.common.MessageConsumerImplementation; -import io.eventuate.tram.consumer.common.spring.TramConsumerCommonConfiguration; +import io.eventuate.tram.spring.consumer.common.TramConsumerCommonConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-consumer-rabbitmq/build.gradle b/eventuate-tram-consumer-rabbitmq/build.gradle index 308d8e71..ee484e75 100644 --- a/eventuate-tram-consumer-rabbitmq/build.gradle +++ b/eventuate-tram-consumer-rabbitmq/build.gradle @@ -2,7 +2,7 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-messaging") - compile project(":eventuate-tram-consumer-common-spring") + compile project(":eventuate-tram-spring-consumer-common") compile "io.eventuate.messaging.rabbitmq:eventuate-messaging-rabbitmq-consumer:$eventuateMessagingRabbitMQVersion" } diff --git a/eventuate-tram-consumer-rabbitmq/src/main/java/io/eventuate/tram/consumer/rabbitmq/EventuateTramRabbitMQMessageConsumerConfiguration.java b/eventuate-tram-consumer-rabbitmq/src/main/java/io/eventuate/tram/consumer/rabbitmq/EventuateTramRabbitMQMessageConsumerConfiguration.java index 229c03da..f5a150e4 100644 --- a/eventuate-tram-consumer-rabbitmq/src/main/java/io/eventuate/tram/consumer/rabbitmq/EventuateTramRabbitMQMessageConsumerConfiguration.java +++ b/eventuate-tram-consumer-rabbitmq/src/main/java/io/eventuate/tram/consumer/rabbitmq/EventuateTramRabbitMQMessageConsumerConfiguration.java @@ -3,7 +3,7 @@ import io.eventuate.messaging.rabbitmq.consumer.MessageConsumerRabbitMQConfiguration; import io.eventuate.messaging.rabbitmq.consumer.MessageConsumerRabbitMQImpl; import io.eventuate.tram.consumer.common.MessageConsumerImplementation; -import io.eventuate.tram.consumer.common.spring.TramConsumerCommonConfiguration; +import io.eventuate.tram.spring.consumer.common.TramConsumerCommonConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-consumer-redis/build.gradle b/eventuate-tram-consumer-redis/build.gradle index bd782516..69996724 100644 --- a/eventuate-tram-consumer-redis/build.gradle +++ b/eventuate-tram-consumer-redis/build.gradle @@ -2,7 +2,7 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-messaging") - compile project(":eventuate-tram-consumer-common-spring") + compile project(":eventuate-tram-spring-consumer-common") compile "io.eventuate.messaging.redis:eventuate-messaging-redis-consumer:$eventuateMessagingRedisVersion" } diff --git a/eventuate-tram-consumer-redis/src/main/java/io/eventuate/tram/consumer/redis/EventuateTramRedisMessageConsumerConfiguration.java b/eventuate-tram-consumer-redis/src/main/java/io/eventuate/tram/consumer/redis/EventuateTramRedisMessageConsumerConfiguration.java index 7be7ae93..fc6c8363 100644 --- a/eventuate-tram-consumer-redis/src/main/java/io/eventuate/tram/consumer/redis/EventuateTramRedisMessageConsumerConfiguration.java +++ b/eventuate-tram-consumer-redis/src/main/java/io/eventuate/tram/consumer/redis/EventuateTramRedisMessageConsumerConfiguration.java @@ -3,7 +3,7 @@ import io.eventuate.messaging.redis.consumer.MessageConsumerRedisConfiguration; import io.eventuate.messaging.redis.consumer.MessageConsumerRedisImpl; import io.eventuate.tram.consumer.common.MessageConsumerImplementation; -import io.eventuate.tram.consumer.common.spring.TramConsumerCommonConfiguration; +import io.eventuate.tram.spring.consumer.common.TramConsumerCommonConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-db-broker-integration-test/build.gradle b/eventuate-tram-db-broker-integration-test/build.gradle index 63f24243..0b62f159 100644 --- a/eventuate-tram-db-broker-integration-test/build.gradle +++ b/eventuate-tram-db-broker-integration-test/build.gradle @@ -2,7 +2,7 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-integration-test-common") - compile project(":eventuate-tram-messaging-spring") + compile project(":eventuate-tram-spring-messaging") testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" testCompile "io.eventuate.cdc:eventuate-local-java-test-util:$eventuateCdcVersion" testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion" diff --git a/eventuate-tram-in-memory-spring/build.gradle b/eventuate-tram-in-memory-spring/build.gradle deleted file mode 100644 index 7b99a30e..00000000 --- a/eventuate-tram-in-memory-spring/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: PublicModulePlugin - -dependencies { - compile project(":eventuate-tram-in-memory") - - compile project(":eventuate-tram-messaging-spring") - compile project(":eventuate-tram-consumer-common-spring") - compile project(":eventuate-tram-messaging-producer-common-spring") - compile project(":eventuate-tram-consumer-jdbc-spring") - - compile "io.eventuate.common:eventuate-common-in-memory-database-spring:$eventuateCommonVersion" - - - testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" - -} \ No newline at end of file diff --git a/eventuate-tram-in-memory/build.gradle b/eventuate-tram-in-memory/build.gradle index 239f8579..144bc09f 100644 --- a/eventuate-tram-in-memory/build.gradle +++ b/eventuate-tram-in-memory/build.gradle @@ -2,8 +2,8 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-messaging") - compile project(":eventuate-tram-consumer-common-spring") - compile project(":eventuate-tram-messaging-producer-common-spring") + compile project(":eventuate-tram-spring-consumer-common") + compile project(":eventuate-tram-spring-messaging-producer-common") compile project(":eventuate-tram-consumer-jdbc") diff --git a/eventuate-tram-integration-test-common/build.gradle b/eventuate-tram-integration-test-common/build.gradle index d9d76d36..6ee896b9 100644 --- a/eventuate-tram-integration-test-common/build.gradle +++ b/eventuate-tram-integration-test-common/build.gradle @@ -1,7 +1,7 @@ apply plugin: PublicModulePlugin dependencies { - compile project(":eventuate-tram-jdbc-kafka-spring") + compile project(":eventuate-tram-spring-jdbc-kafka") compile project(":eventuate-tram-jdbc-rabbitmq") compile project(":eventuate-tram-jdbc-activemq") compile project(":eventuate-tram-jdbc-redis") diff --git a/eventuate-tram-integration-test-common/src/main/java/io/eventuate/tram/integrationtest/common/TramIntegrationTestMySqlBinlogKafkaConfiguration.java b/eventuate-tram-integration-test-common/src/main/java/io/eventuate/tram/integrationtest/common/TramIntegrationTestMySqlBinlogKafkaConfiguration.java index 776f7cc6..3c17e037 100644 --- a/eventuate-tram-integration-test-common/src/main/java/io/eventuate/tram/integrationtest/common/TramIntegrationTestMySqlBinlogKafkaConfiguration.java +++ b/eventuate-tram-integration-test-common/src/main/java/io/eventuate/tram/integrationtest/common/TramIntegrationTestMySqlBinlogKafkaConfiguration.java @@ -1,6 +1,6 @@ package io.eventuate.tram.integrationtest.common; -import io.eventuate.tram.jdbckafka.TramJdbcKafkaConfiguration; +import io.eventuate.tram.spring.jdbckafka.TramJdbcKafkaConfiguration; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-jdbc-activemq/build.gradle b/eventuate-tram-jdbc-activemq/build.gradle index fdb973fe..13920e14 100644 --- a/eventuate-tram-jdbc-activemq/build.gradle +++ b/eventuate-tram-jdbc-activemq/build.gradle @@ -2,9 +2,9 @@ apply plugin: PublicModulePlugin dependencies { - compile project(":eventuate-tram-consumer-common-spring") - compile project(":eventuate-tram-producer-jdbc-spring") - compile project(":eventuate-tram-consumer-jdbc-spring") + compile project(":eventuate-tram-spring-consumer-common") + compile project(":eventuate-tram-spring-producer-jdbc") + compile project(":eventuate-tram-spring-consumer-jdbc") compile project(":eventuate-tram-consumer-activemq") compile "io.eventuate.messaging.activemq:eventuate-messaging-activemq-consumer:$eventuateMessagingActiveMQVersion" diff --git a/eventuate-tram-jdbc-activemq/src/main/java/io/eventuate/tram/jdbcactivemq/TramJdbcActiveMQConfiguration.java b/eventuate-tram-jdbc-activemq/src/main/java/io/eventuate/tram/jdbcactivemq/TramJdbcActiveMQConfiguration.java index 0b182572..24ff0e98 100644 --- a/eventuate-tram-jdbc-activemq/src/main/java/io/eventuate/tram/jdbcactivemq/TramJdbcActiveMQConfiguration.java +++ b/eventuate-tram-jdbc-activemq/src/main/java/io/eventuate/tram/jdbcactivemq/TramJdbcActiveMQConfiguration.java @@ -1,7 +1,7 @@ package io.eventuate.tram.jdbcactivemq; import io.eventuate.tram.consumer.activemq.EventuateTramActiveMQMessageConsumerConfiguration; -import io.eventuate.tram.messaging.producer.jdbc.spring.TramMessageProducerJdbcConfiguration; +import io.eventuate.tram.spring.messaging.producer.jdbc.TramMessageProducerJdbcConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-jdbc-kafka-spring/build.gradle b/eventuate-tram-jdbc-kafka-spring/build.gradle deleted file mode 100644 index bdd33a43..00000000 --- a/eventuate-tram-jdbc-kafka-spring/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: PublicModulePlugin - -dependencies { - compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-consumer-spring:$eventuateMessagingKafkaVersion" - - compile project(":eventuate-tram-producer-jdbc-spring") - compile project(":eventuate-tram-consumer-common-spring") - compile project(":eventuate-tram-consumer-jdbc-spring") - compile project(":eventuate-tram-consumer-kafka-spring") -} \ No newline at end of file diff --git a/eventuate-tram-jdbc-rabbitmq/build.gradle b/eventuate-tram-jdbc-rabbitmq/build.gradle index fa18125f..1597e431 100644 --- a/eventuate-tram-jdbc-rabbitmq/build.gradle +++ b/eventuate-tram-jdbc-rabbitmq/build.gradle @@ -3,8 +3,8 @@ apply plugin: PublicModulePlugin dependencies { compile "io.eventuate.messaging.rabbitmq:eventuate-messaging-rabbitmq-consumer:$eventuateMessagingRabbitMQVersion" - compile project(":eventuate-tram-consumer-common-spring") - compile project(":eventuate-tram-producer-jdbc-spring") - compile project(":eventuate-tram-consumer-jdbc-spring") + compile project(":eventuate-tram-spring-consumer-common") + compile project(":eventuate-tram-spring-producer-jdbc") + compile project(":eventuate-tram-spring-consumer-jdbc") compile project(":eventuate-tram-consumer-rabbitmq") } \ No newline at end of file diff --git a/eventuate-tram-jdbc-rabbitmq/src/main/java/io/eventuate/tram/jdbcrabbitmq/TramJdbcRabbitMQConfiguration.java b/eventuate-tram-jdbc-rabbitmq/src/main/java/io/eventuate/tram/jdbcrabbitmq/TramJdbcRabbitMQConfiguration.java index 94edcd5e..0ca6a59b 100644 --- a/eventuate-tram-jdbc-rabbitmq/src/main/java/io/eventuate/tram/jdbcrabbitmq/TramJdbcRabbitMQConfiguration.java +++ b/eventuate-tram-jdbc-rabbitmq/src/main/java/io/eventuate/tram/jdbcrabbitmq/TramJdbcRabbitMQConfiguration.java @@ -1,7 +1,7 @@ package io.eventuate.tram.jdbcrabbitmq; import io.eventuate.tram.consumer.rabbitmq.EventuateTramRabbitMQMessageConsumerConfiguration; -import io.eventuate.tram.messaging.producer.jdbc.spring.TramMessageProducerJdbcConfiguration; +import io.eventuate.tram.spring.messaging.producer.jdbc.TramMessageProducerJdbcConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-jdbc-redis/build.gradle b/eventuate-tram-jdbc-redis/build.gradle index f6426fad..89c2a8e2 100644 --- a/eventuate-tram-jdbc-redis/build.gradle +++ b/eventuate-tram-jdbc-redis/build.gradle @@ -3,8 +3,8 @@ apply plugin: PublicModulePlugin dependencies { compile "io.eventuate.messaging.redis:eventuate-messaging-redis-consumer:$eventuateMessagingRedisVersion" - compile project(":eventuate-tram-consumer-common-spring") - compile project(":eventuate-tram-producer-jdbc-spring") - compile project(":eventuate-tram-consumer-jdbc-spring") + compile project(":eventuate-tram-spring-consumer-common") + compile project(":eventuate-tram-spring-producer-jdbc") + compile project(":eventuate-tram-spring-consumer-jdbc") compile project(":eventuate-tram-consumer-redis") } \ No newline at end of file diff --git a/eventuate-tram-jdbc-redis/src/main/java/io/eventuate/tram/jdbcredis/TramJdbcRedisConfiguration.java b/eventuate-tram-jdbc-redis/src/main/java/io/eventuate/tram/jdbcredis/TramJdbcRedisConfiguration.java index ebc2e82c..1fd47fa7 100644 --- a/eventuate-tram-jdbc-redis/src/main/java/io/eventuate/tram/jdbcredis/TramJdbcRedisConfiguration.java +++ b/eventuate-tram-jdbc-redis/src/main/java/io/eventuate/tram/jdbcredis/TramJdbcRedisConfiguration.java @@ -1,7 +1,7 @@ package io.eventuate.tram.jdbcredis; import io.eventuate.tram.consumer.redis.EventuateTramRedisMessageConsumerConfiguration; -import io.eventuate.tram.messaging.producer.jdbc.spring.TramMessageProducerJdbcConfiguration; +import io.eventuate.tram.spring.messaging.producer.jdbc.TramMessageProducerJdbcConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-commands-micronaut/build.gradle b/eventuate-tram-micronaut-commands/build.gradle similarity index 100% rename from eventuate-tram-commands-micronaut/build.gradle rename to eventuate-tram-micronaut-commands/build.gradle diff --git a/eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/CommandDispatcherInitializer.java b/eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/CommandDispatcherInitializer.java similarity index 93% rename from eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/CommandDispatcherInitializer.java rename to eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/CommandDispatcherInitializer.java index 219110ca..0058b9fa 100644 --- a/eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/CommandDispatcherInitializer.java +++ b/eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/CommandDispatcherInitializer.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.commands.micronaut; +package io.eventuate.tram.micronaut.commands; import io.eventuate.tram.commands.consumer.CommandDispatcher; import io.micronaut.context.annotation.Context; diff --git a/eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/consumer/TramCommandConsumerFactory.java b/eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/consumer/TramCommandConsumerFactory.java similarity index 90% rename from eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/consumer/TramCommandConsumerFactory.java rename to eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/consumer/TramCommandConsumerFactory.java index 080f3d8c..227eba3e 100644 --- a/eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/consumer/TramCommandConsumerFactory.java +++ b/eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/consumer/TramCommandConsumerFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.commands.micronaut.consumer; +package io.eventuate.tram.micronaut.commands.consumer; import io.eventuate.tram.commands.consumer.CommandDispatcherFactory; import io.eventuate.tram.messaging.consumer.MessageConsumer; diff --git a/eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/producer/TramCommandProducerFactory.java b/eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/producer/TramCommandProducerFactory.java similarity index 90% rename from eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/producer/TramCommandProducerFactory.java rename to eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/producer/TramCommandProducerFactory.java index 8b4335f2..2b01aa72 100644 --- a/eventuate-tram-commands-micronaut/src/main/java/io/eventuate/tram/commands/micronaut/producer/TramCommandProducerFactory.java +++ b/eventuate-tram-micronaut-commands/src/main/java/io/eventuate/tram/micronaut/commands/producer/TramCommandProducerFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.commands.micronaut.producer; +package io.eventuate.tram.micronaut.commands.producer; import io.eventuate.tram.commands.producer.CommandProducer; import io.eventuate.tram.commands.producer.CommandProducerImpl; diff --git a/eventuate-tram-consumer-common-micronaut/build.gradle b/eventuate-tram-micronaut-consumer-common/build.gradle similarity index 100% rename from eventuate-tram-consumer-common-micronaut/build.gradle rename to eventuate-tram-micronaut-consumer-common/build.gradle diff --git a/eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramConsumerBaseCommonFactory.java b/eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramConsumerBaseCommonFactory.java similarity index 95% rename from eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramConsumerBaseCommonFactory.java rename to eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramConsumerBaseCommonFactory.java index f0b451fd..4380a71a 100644 --- a/eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramConsumerBaseCommonFactory.java +++ b/eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramConsumerBaseCommonFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.common.micronaut; +package io.eventuate.tram.micronaut.consumer.common; import io.eventuate.tram.consumer.common.*; import io.eventuate.tram.messaging.common.MessageInterceptor; diff --git a/eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramConsumerCommonFactory.java b/eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramConsumerCommonFactory.java similarity index 94% rename from eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramConsumerCommonFactory.java rename to eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramConsumerCommonFactory.java index 04f2e677..ec46a381 100644 --- a/eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramConsumerCommonFactory.java +++ b/eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramConsumerCommonFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.common.micronaut; +package io.eventuate.tram.micronaut.consumer.common; import io.eventuate.tram.consumer.common.DecoratedMessageHandlerFactory; import io.eventuate.tram.consumer.common.MessageConsumerImpl; diff --git a/eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramNoopDuplicateMessageDetectorFactory.java b/eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramNoopDuplicateMessageDetectorFactory.java similarity index 90% rename from eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramNoopDuplicateMessageDetectorFactory.java rename to eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramNoopDuplicateMessageDetectorFactory.java index 5ae2c191..f3e4c3fb 100644 --- a/eventuate-tram-consumer-common-micronaut/src/main/java/io/eventuate/tram/consumer/common/micronaut/TramNoopDuplicateMessageDetectorFactory.java +++ b/eventuate-tram-micronaut-consumer-common/src/main/java/io/eventuate/tram/micronaut/consumer/common/TramNoopDuplicateMessageDetectorFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.common.micronaut; +package io.eventuate.tram.micronaut.consumer.common; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import io.eventuate.tram.consumer.common.NoopDuplicateMessageDetector; diff --git a/eventuate-tram-consumer-jdbc-micronaut/build.gradle b/eventuate-tram-micronaut-consumer-jdbc/build.gradle similarity index 91% rename from eventuate-tram-consumer-jdbc-micronaut/build.gradle rename to eventuate-tram-micronaut-consumer-jdbc/build.gradle index 8ea3262f..fd5402d6 100644 --- a/eventuate-tram-consumer-jdbc-micronaut/build.gradle +++ b/eventuate-tram-micronaut-consumer-jdbc/build.gradle @@ -16,7 +16,7 @@ dependencyManagement { dependencies { compile project(":eventuate-tram-consumer-jdbc") compile "io.micronaut:micronaut-spring" - compile "io.eventuate.common:eventuate-common-jdbc-micronaut-spring:$eventuateCommonVersion" + compile "io.eventuate.common:eventuate-common-micronaut-spring-jdbc:$eventuateCommonVersion" annotationProcessor "io.micronaut:micronaut-inject-java" annotationProcessor "io.micronaut:micronaut-validation" diff --git a/eventuate-tram-consumer-jdbc-micronaut/src/main/java/io/eventuate/tram/consumer/jdbc/micronaut/TramConsumerJdbcFactory.java b/eventuate-tram-micronaut-consumer-jdbc/src/main/java/io/eventuate/tram/micronaut/consumer/jdbc/TramConsumerJdbcFactory.java similarity index 97% rename from eventuate-tram-consumer-jdbc-micronaut/src/main/java/io/eventuate/tram/consumer/jdbc/micronaut/TramConsumerJdbcFactory.java rename to eventuate-tram-micronaut-consumer-jdbc/src/main/java/io/eventuate/tram/micronaut/consumer/jdbc/TramConsumerJdbcFactory.java index a2367f36..17a867a9 100644 --- a/eventuate-tram-consumer-jdbc-micronaut/src/main/java/io/eventuate/tram/consumer/jdbc/micronaut/TramConsumerJdbcFactory.java +++ b/eventuate-tram-micronaut-consumer-jdbc/src/main/java/io/eventuate/tram/micronaut/consumer/jdbc/TramConsumerJdbcFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.jdbc.micronaut; +package io.eventuate.tram.micronaut.consumer.jdbc; import io.eventuate.common.jdbc.EventuateJdbcStatementExecutor; import io.eventuate.common.jdbc.EventuateSchema; diff --git a/eventuate-tram-consumer-jdbc-micronaut/src/main/java/io/eventuate/tram/consumer/jdbc/micronaut/TransactionalNoopDuplicateMessageDetectorFactory.java b/eventuate-tram-micronaut-consumer-jdbc/src/main/java/io/eventuate/tram/micronaut/consumer/jdbc/TransactionalNoopDuplicateMessageDetectorFactory.java similarity index 93% rename from eventuate-tram-consumer-jdbc-micronaut/src/main/java/io/eventuate/tram/consumer/jdbc/micronaut/TransactionalNoopDuplicateMessageDetectorFactory.java rename to eventuate-tram-micronaut-consumer-jdbc/src/main/java/io/eventuate/tram/micronaut/consumer/jdbc/TransactionalNoopDuplicateMessageDetectorFactory.java index 3d3003c8..a41a92fc 100644 --- a/eventuate-tram-consumer-jdbc-micronaut/src/main/java/io/eventuate/tram/consumer/jdbc/micronaut/TransactionalNoopDuplicateMessageDetectorFactory.java +++ b/eventuate-tram-micronaut-consumer-jdbc/src/main/java/io/eventuate/tram/micronaut/consumer/jdbc/TransactionalNoopDuplicateMessageDetectorFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.jdbc.micronaut; +package io.eventuate.tram.micronaut.consumer.jdbc; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import io.eventuate.tram.consumer.jdbc.TransactionalNoopDuplicateMessageDetector; diff --git a/eventuate-tram-consumer-jdbc-micronaut/src/test/java/io/eventuate/tram/consumer/jdbc/micronaut/EventuateMicronautSqlTableBasedDuplicateMessageDetectorTest.java b/eventuate-tram-micronaut-consumer-jdbc/src/test/java/io/eventuate/tram/micronaut/consumer/jdbc/EventuateMicronautSqlTableBasedDuplicateMessageDetectorTest.java similarity index 93% rename from eventuate-tram-consumer-jdbc-micronaut/src/test/java/io/eventuate/tram/consumer/jdbc/micronaut/EventuateMicronautSqlTableBasedDuplicateMessageDetectorTest.java rename to eventuate-tram-micronaut-consumer-jdbc/src/test/java/io/eventuate/tram/micronaut/consumer/jdbc/EventuateMicronautSqlTableBasedDuplicateMessageDetectorTest.java index 30a3d5df..7ea8917f 100644 --- a/eventuate-tram-consumer-jdbc-micronaut/src/test/java/io/eventuate/tram/consumer/jdbc/micronaut/EventuateMicronautSqlTableBasedDuplicateMessageDetectorTest.java +++ b/eventuate-tram-micronaut-consumer-jdbc/src/test/java/io/eventuate/tram/micronaut/consumer/jdbc/EventuateMicronautSqlTableBasedDuplicateMessageDetectorTest.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.jdbc.micronaut; +package io.eventuate.tram.micronaut.consumer.jdbc; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import io.micronaut.test.annotation.MicronautTest; diff --git a/eventuate-tram-consumer-jdbc-micronaut/src/test/resources/application.yml b/eventuate-tram-micronaut-consumer-jdbc/src/test/resources/application.yml similarity index 100% rename from eventuate-tram-consumer-jdbc-micronaut/src/test/resources/application.yml rename to eventuate-tram-micronaut-consumer-jdbc/src/test/resources/application.yml diff --git a/eventuate-tram-consumer-kafka-micronaut/build.gradle b/eventuate-tram-micronaut-consumer-kafka/build.gradle similarity index 81% rename from eventuate-tram-consumer-kafka-micronaut/build.gradle rename to eventuate-tram-micronaut-consumer-kafka/build.gradle index 132945a3..db5cdab0 100644 --- a/eventuate-tram-consumer-kafka-micronaut/build.gradle +++ b/eventuate-tram-micronaut-consumer-kafka/build.gradle @@ -17,10 +17,10 @@ dependencyManagement { } dependencies { - compile project(":eventuate-tram-messaging-micronaut") + compile project(":eventuate-tram-micronaut-messaging") compile project(":eventuate-tram-consumer-kafka") - compile project (":eventuate-tram-consumer-common-micronaut") - compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-consumer-micronaut:$eventuateMessagingKafkaVersion" + compile project (":eventuate-tram-micronaut-consumer-common") + compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-micronaut-consumer:$eventuateMessagingKafkaVersion" annotationProcessor "io.micronaut:micronaut-inject-java" annotationProcessor "io.micronaut:micronaut-validation" diff --git a/eventuate-tram-consumer-kafka-micronaut/src/main/java/io/eventuate/tram/consumer/kafka/EventuateTramKafkaMessageConsumerFactory.java b/eventuate-tram-micronaut-consumer-kafka/src/main/java/io/eventuate/tram/micronaut/consumer/kafka/EventuateTramKafkaMessageConsumerFactory.java similarity index 79% rename from eventuate-tram-consumer-kafka-micronaut/src/main/java/io/eventuate/tram/consumer/kafka/EventuateTramKafkaMessageConsumerFactory.java rename to eventuate-tram-micronaut-consumer-kafka/src/main/java/io/eventuate/tram/micronaut/consumer/kafka/EventuateTramKafkaMessageConsumerFactory.java index 1a5c03a4..b7161aad 100644 --- a/eventuate-tram-consumer-kafka-micronaut/src/main/java/io/eventuate/tram/consumer/kafka/EventuateTramKafkaMessageConsumerFactory.java +++ b/eventuate-tram-micronaut-consumer-kafka/src/main/java/io/eventuate/tram/micronaut/consumer/kafka/EventuateTramKafkaMessageConsumerFactory.java @@ -1,7 +1,8 @@ -package io.eventuate.tram.consumer.kafka; +package io.eventuate.tram.micronaut.consumer.kafka; import io.eventuate.messaging.kafka.consumer.MessageConsumerKafkaImpl; import io.eventuate.tram.consumer.common.MessageConsumerImplementation; +import io.eventuate.tram.consumer.kafka.EventuateTramKafkaMessageConsumer; import io.micronaut.context.annotation.Factory; import javax.inject.Singleton; diff --git a/eventuate-tram-events-micronaut/build.gradle b/eventuate-tram-micronaut-events/build.gradle similarity index 100% rename from eventuate-tram-events-micronaut/build.gradle rename to eventuate-tram-micronaut-events/build.gradle diff --git a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/common/TramEventsCommonFactory.java b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/common/TramEventsCommonFactory.java similarity index 90% rename from eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/common/TramEventsCommonFactory.java rename to eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/common/TramEventsCommonFactory.java index 57abeb1a..f2a6b18b 100644 --- a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/common/TramEventsCommonFactory.java +++ b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/common/TramEventsCommonFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.micronaut.common; +package io.eventuate.tram.micronaut.events.common; import io.eventuate.tram.events.common.DefaultDomainEventNameMapping; import io.eventuate.tram.events.common.DomainEventNameMapping; diff --git a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/publisher/TramEventsPublisherFactory.java b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/publisher/TramEventsPublisherFactory.java similarity index 92% rename from eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/publisher/TramEventsPublisherFactory.java rename to eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/publisher/TramEventsPublisherFactory.java index abaf6a66..3f68c646 100644 --- a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/publisher/TramEventsPublisherFactory.java +++ b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/publisher/TramEventsPublisherFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.micronaut.publisher; +package io.eventuate.tram.micronaut.events.publisher; import io.eventuate.tram.events.common.DomainEventNameMapping; import io.eventuate.tram.events.publisher.DomainEventPublisher; diff --git a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/subscriber/DomainEventDispatcherInitializer.java b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/subscriber/DomainEventDispatcherInitializer.java similarity index 93% rename from eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/subscriber/DomainEventDispatcherInitializer.java rename to eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/subscriber/DomainEventDispatcherInitializer.java index 8bb1dc40..57c2e004 100644 --- a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/subscriber/DomainEventDispatcherInitializer.java +++ b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/subscriber/DomainEventDispatcherInitializer.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.micronaut.subscriber; +package io.eventuate.tram.micronaut.events.subscriber; import io.eventuate.tram.events.subscriber.DomainEventDispatcher; import io.micronaut.context.annotation.Context; diff --git a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/subscriber/TramEventSubscriberFactory.java b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/subscriber/TramEventSubscriberFactory.java similarity index 91% rename from eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/subscriber/TramEventSubscriberFactory.java rename to eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/subscriber/TramEventSubscriberFactory.java index 91227f9f..14ddc1af 100644 --- a/eventuate-tram-events-micronaut/src/main/java/io/eventuate/tram/events/micronaut/subscriber/TramEventSubscriberFactory.java +++ b/eventuate-tram-micronaut-events/src/main/java/io/eventuate/tram/micronaut/events/subscriber/TramEventSubscriberFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.micronaut.subscriber; +package io.eventuate.tram.micronaut.events.subscriber; import io.eventuate.tram.events.common.DomainEventNameMapping; import io.eventuate.tram.events.subscriber.DomainEventDispatcherFactory; diff --git a/eventuate-tram-in-memory-micronaut/build.gradle b/eventuate-tram-micronaut-in-memory/build.gradle similarity index 77% rename from eventuate-tram-in-memory-micronaut/build.gradle rename to eventuate-tram-micronaut-in-memory/build.gradle index c98d21aa..8f021f3b 100644 --- a/eventuate-tram-in-memory-micronaut/build.gradle +++ b/eventuate-tram-micronaut-in-memory/build.gradle @@ -16,12 +16,12 @@ dependencyManagement { dependencies { compile project(":eventuate-tram-in-memory") - compile project(":eventuate-tram-messaging-micronaut") - compile project(":eventuate-tram-consumer-common-micronaut") - compile project(":eventuate-tram-messaging-producer-common-micronaut") - compile project(":eventuate-tram-consumer-jdbc-micronaut") + compile project(":eventuate-tram-micronaut-messaging") + compile project(":eventuate-tram-micronaut-consumer-common") + compile project(":eventuate-tram-micronaut-messaging-producer-common") + compile project(":eventuate-tram-micronaut-consumer-jdbc") - compile "io.eventuate.common:eventuate-common-in-memory-database-micronaut:$eventuateCommonVersion" + compile "io.eventuate.common:eventuate-common-micronaut-in-memory-database:$eventuateCommonVersion" compile "io.micronaut:micronaut-spring" annotationProcessor "io.micronaut:micronaut-inject-java" diff --git a/eventuate-tram-in-memory-micronaut/src/main/java/io/eventuate/tram/inmemory/micronaut/TramInMemoryFactory.java b/eventuate-tram-micronaut-in-memory/src/main/java/io/eventuate/tram/micronaut/inmemory/TramInMemoryFactory.java similarity index 97% rename from eventuate-tram-in-memory-micronaut/src/main/java/io/eventuate/tram/inmemory/micronaut/TramInMemoryFactory.java rename to eventuate-tram-micronaut-in-memory/src/main/java/io/eventuate/tram/micronaut/inmemory/TramInMemoryFactory.java index 75a691fe..922c2f31 100644 --- a/eventuate-tram-in-memory-micronaut/src/main/java/io/eventuate/tram/inmemory/micronaut/TramInMemoryFactory.java +++ b/eventuate-tram-micronaut-in-memory/src/main/java/io/eventuate/tram/micronaut/inmemory/TramInMemoryFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.inmemory.micronaut; +package io.eventuate.tram.micronaut.inmemory; import io.eventuate.common.id.IdGenerator; import io.eventuate.common.id.IdGeneratorImpl; diff --git a/eventuate-tram-in-memory-micronaut/src/test/java/io/eventuate/tram/inmemory/micronaut/InMemoryMessageProducerTest.java b/eventuate-tram-micronaut-in-memory/src/test/java/io/eventuate/tram/micronaut/inmemory/InMemoryMessageProducerTest.java similarity index 98% rename from eventuate-tram-in-memory-micronaut/src/test/java/io/eventuate/tram/inmemory/micronaut/InMemoryMessageProducerTest.java rename to eventuate-tram-micronaut-in-memory/src/test/java/io/eventuate/tram/micronaut/inmemory/InMemoryMessageProducerTest.java index cb4ed1b7..d4d79ac3 100644 --- a/eventuate-tram-in-memory-micronaut/src/test/java/io/eventuate/tram/inmemory/micronaut/InMemoryMessageProducerTest.java +++ b/eventuate-tram-micronaut-in-memory/src/test/java/io/eventuate/tram/micronaut/inmemory/InMemoryMessageProducerTest.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.inmemory.micronaut; +package io.eventuate.tram.micronaut.inmemory; import io.eventuate.tram.inmemory.InMemoryMessageConsumer; import io.eventuate.tram.inmemory.InMemoryMessageProducer; diff --git a/eventuate-tram-in-memory-micronaut/src/test/resources/application.yml b/eventuate-tram-micronaut-in-memory/src/test/resources/application.yml similarity index 100% rename from eventuate-tram-in-memory-micronaut/src/test/resources/application.yml rename to eventuate-tram-micronaut-in-memory/src/test/resources/application.yml diff --git a/eventuate-tram-messaging-producer-common-micronaut/build.gradle b/eventuate-tram-micronaut-messaging-producer-common/build.gradle similarity index 100% rename from eventuate-tram-messaging-producer-common-micronaut/build.gradle rename to eventuate-tram-micronaut-messaging-producer-common/build.gradle diff --git a/eventuate-tram-messaging-producer-common-micronaut/src/main/java/io/eventuate/tram/messaging/producer/common/micronaut/TramMessagingCommonProducerFactory.java b/eventuate-tram-micronaut-messaging-producer-common/src/main/java/io/eventuate/tram/micronaut/messaging/producer/common/TramMessagingCommonProducerFactory.java similarity index 92% rename from eventuate-tram-messaging-producer-common-micronaut/src/main/java/io/eventuate/tram/messaging/producer/common/micronaut/TramMessagingCommonProducerFactory.java rename to eventuate-tram-micronaut-messaging-producer-common/src/main/java/io/eventuate/tram/micronaut/messaging/producer/common/TramMessagingCommonProducerFactory.java index cb7d7ffa..0d6126b0 100644 --- a/eventuate-tram-messaging-producer-common-micronaut/src/main/java/io/eventuate/tram/messaging/producer/common/micronaut/TramMessagingCommonProducerFactory.java +++ b/eventuate-tram-micronaut-messaging-producer-common/src/main/java/io/eventuate/tram/micronaut/messaging/producer/common/TramMessagingCommonProducerFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.messaging.producer.common.micronaut; +package io.eventuate.tram.micronaut.messaging.producer.common; import io.eventuate.tram.messaging.common.ChannelMapping; import io.eventuate.tram.messaging.common.MessageInterceptor; diff --git a/eventuate-tram-messaging-micronaut/build.gradle b/eventuate-tram-micronaut-messaging/build.gradle similarity index 100% rename from eventuate-tram-messaging-micronaut/build.gradle rename to eventuate-tram-micronaut-messaging/build.gradle diff --git a/eventuate-tram-messaging-micronaut/src/main/java/io/eventuate/tram/messaging/common/micronaut/TramMessagingCommonFactory.java b/eventuate-tram-micronaut-messaging/src/main/java/io/eventuate/tram/micronaut/messaging/common/TramMessagingCommonFactory.java similarity index 90% rename from eventuate-tram-messaging-micronaut/src/main/java/io/eventuate/tram/messaging/common/micronaut/TramMessagingCommonFactory.java rename to eventuate-tram-micronaut-messaging/src/main/java/io/eventuate/tram/micronaut/messaging/common/TramMessagingCommonFactory.java index 38373e2d..3db46371 100644 --- a/eventuate-tram-messaging-micronaut/src/main/java/io/eventuate/tram/messaging/common/micronaut/TramMessagingCommonFactory.java +++ b/eventuate-tram-micronaut-messaging/src/main/java/io/eventuate/tram/micronaut/messaging/common/TramMessagingCommonFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.messaging.common.micronaut; +package io.eventuate.tram.micronaut.messaging.common; import io.eventuate.tram.messaging.common.ChannelMapping; import io.eventuate.tram.messaging.common.DefaultChannelMapping; diff --git a/eventuate-tram-producer-jdbc-micronaut/build.gradle b/eventuate-tram-micronaut-producer-jdbc/build.gradle similarity index 78% rename from eventuate-tram-producer-jdbc-micronaut/build.gradle rename to eventuate-tram-micronaut-producer-jdbc/build.gradle index ec55026a..731c7b43 100644 --- a/eventuate-tram-producer-jdbc-micronaut/build.gradle +++ b/eventuate-tram-micronaut-producer-jdbc/build.gradle @@ -17,11 +17,11 @@ dependencyManagement { } dependencies { - compile project(":eventuate-tram-messaging-micronaut") + compile project(":eventuate-tram-micronaut-messaging") compile project(":eventuate-tram-producer-jdbc") - compile project(":eventuate-tram-messaging-producer-common-micronaut") + compile project(":eventuate-tram-micronaut-messaging-producer-common") - compile "io.eventuate.common:eventuate-common-jdbc-micronaut:$eventuateCommonVersion" + compile "io.eventuate.common:eventuate-common-micronaut-jdbc:$eventuateCommonVersion" annotationProcessor "io.micronaut:micronaut-inject-java" annotationProcessor "io.micronaut:micronaut-validation" diff --git a/eventuate-tram-producer-jdbc-micronaut/src/main/java/io/eventuate/tram/messaging/producer/jdbc/micronaut/TramMessageProducerJdbcFactory.java b/eventuate-tram-micronaut-producer-jdbc/src/main/java/io/eventuate/tram/micronaut/messaging/producer/jdbc/TramMessageProducerJdbcFactory.java similarity index 96% rename from eventuate-tram-producer-jdbc-micronaut/src/main/java/io/eventuate/tram/messaging/producer/jdbc/micronaut/TramMessageProducerJdbcFactory.java rename to eventuate-tram-micronaut-producer-jdbc/src/main/java/io/eventuate/tram/micronaut/messaging/producer/jdbc/TramMessageProducerJdbcFactory.java index 16a0ed1f..ecbd3b9a 100644 --- a/eventuate-tram-producer-jdbc-micronaut/src/main/java/io/eventuate/tram/messaging/producer/jdbc/micronaut/TramMessageProducerJdbcFactory.java +++ b/eventuate-tram-micronaut-producer-jdbc/src/main/java/io/eventuate/tram/micronaut/messaging/producer/jdbc/TramMessageProducerJdbcFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.messaging.producer.jdbc.micronaut; +package io.eventuate.tram.micronaut.messaging.producer.jdbc; import io.eventuate.common.id.IdGenerator; import io.eventuate.common.id.IdGeneratorImpl; diff --git a/eventuate-tram-producer-jdbc-spring/build.gradle b/eventuate-tram-producer-jdbc-spring/build.gradle deleted file mode 100644 index 96636753..00000000 --- a/eventuate-tram-producer-jdbc-spring/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply plugin: PublicModulePlugin - -dependencies { - compile project(":eventuate-tram-producer-jdbc") - compile project(":eventuate-tram-messaging-producer-common-spring") - - compile "io.eventuate.common:eventuate-common-jdbc-spring:$eventuateCommonVersion" -} - diff --git a/eventuate-tram-spring-cloud-sleuth-integration/build.gradle b/eventuate-tram-spring-cloud-sleuth-integration/build.gradle index fcbdcd60..cc72069c 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/build.gradle +++ b/eventuate-tram-spring-cloud-sleuth-integration/build.gradle @@ -41,7 +41,7 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" - testCompile project(":eventuate-tram-in-memory-spring") + testCompile project(":eventuate-tram-spring-in-memory") testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion" diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/MessageHeaderAccessor.java b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/MessageHeaderAccessor.java similarity index 70% rename from eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/MessageHeaderAccessor.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/MessageHeaderAccessor.java index ce784f5f..76a2d79a 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/MessageHeaderAccessor.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/MessageHeaderAccessor.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration; +package io.eventuate.tram.spring.cloudsleuthintegration; public interface MessageHeaderAccessor { void put(String key, String value); diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/MessageHeaderPropagation.java b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/MessageHeaderPropagation.java similarity index 92% rename from eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/MessageHeaderPropagation.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/MessageHeaderPropagation.java index f8865bff..0569aa66 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/MessageHeaderPropagation.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/MessageHeaderPropagation.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration; +package io.eventuate.tram.spring.cloudsleuthintegration; import brave.propagation.Propagation; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/TracingMessagingInterceptor.java b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/TracingMessagingInterceptor.java similarity index 98% rename from eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/TracingMessagingInterceptor.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/TracingMessagingInterceptor.java index 7dd8e5ee..6eaab9d1 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/TracingMessagingInterceptor.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/TracingMessagingInterceptor.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration; +package io.eventuate.tram.spring.cloudsleuthintegration; import brave.Span; import brave.Tracer; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/TramSpringCloudSleuthIntegrationConfiguration.java b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/TramSpringCloudSleuthIntegrationConfiguration.java similarity index 88% rename from eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/TramSpringCloudSleuthIntegrationConfiguration.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/TramSpringCloudSleuthIntegrationConfiguration.java index e4d0b5d4..700510c3 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/springcloudsleuthintegration/TramSpringCloudSleuthIntegrationConfiguration.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/main/java/io/eventuate/tram/spring/cloudsleuthintegration/TramSpringCloudSleuthIntegrationConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration; +package io.eventuate.tram.spring.cloudsleuthintegration; import brave.Tracing; import org.springframework.context.annotation.Bean; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/main/resources/META-INF/spring.factories b/eventuate-tram-spring-cloud-sleuth-integration/src/main/resources/META-INF/spring.factories index 9ce7df96..d100d7c3 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/main/resources/META-INF/spring.factories +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.eventuate.tram.springcloudsleuthintegration.TramSpringCloudSleuthIntegrationConfiguration +io.eventuate.tram.spring.cloudsleuthintegration.TramSpringCloudSleuthIntegrationConfiguration diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/OpenZipkinTraceDeserializer.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/OpenZipkinTraceDeserializer.java similarity index 91% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/OpenZipkinTraceDeserializer.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/OpenZipkinTraceDeserializer.java index 14bcee19..7423f1be 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/OpenZipkinTraceDeserializer.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/OpenZipkinTraceDeserializer.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/OpenZipkinTraceDeserializerTest.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/OpenZipkinTraceDeserializerTest.java similarity index 91% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/OpenZipkinTraceDeserializerTest.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/OpenZipkinTraceDeserializerTest.java index d4e6938f..46e4db79 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/OpenZipkinTraceDeserializerTest.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/OpenZipkinTraceDeserializerTest.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; import org.junit.Test; import org.springframework.util.StreamUtils; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/SpringCloudSleuthIntegrationTest.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/SpringCloudSleuthIntegrationTest.java similarity index 96% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/SpringCloudSleuthIntegrationTest.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/SpringCloudSleuthIntegrationTest.java index 7b927672..d18aaf65 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/SpringCloudSleuthIntegrationTest.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/SpringCloudSleuthIntegrationTest.java @@ -1,6 +1,6 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; -import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration; +import io.eventuate.tram.spring.inmemory.TramInMemoryConfiguration; import io.eventuate.util.test.async.Eventually; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestConsumer.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestConsumer.java similarity index 95% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestConsumer.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestConsumer.java index 2361d5e4..4c505be4 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestConsumer.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestConsumer.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; import io.eventuate.common.json.mapper.JSonMapper; import io.eventuate.tram.messaging.common.Message; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestController.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestController.java similarity index 94% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestController.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestController.java index d464f33d..df39948d 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestController.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestController.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; import io.eventuate.common.json.mapper.JSonMapper; import io.eventuate.tram.messaging.common.Message; diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestMessage.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestMessage.java similarity index 80% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestMessage.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestMessage.java index 8cea4174..3fb9a330 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/TestMessage.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/TestMessage.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; public class TestMessage { diff --git a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/ZipkinSpan.java b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/ZipkinSpan.java similarity index 95% rename from eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/ZipkinSpan.java rename to eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/ZipkinSpan.java index 6c89c081..67dbf15b 100644 --- a/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/springcloudsleuthintegration/test/ZipkinSpan.java +++ b/eventuate-tram-spring-cloud-sleuth-integration/src/test/java/io/eventuate/tram/spring/cloudsleuthintegration/test/ZipkinSpan.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudsleuthintegration.test; +package io.eventuate.tram.spring.cloudsleuthintegration.test; import org.apache.commons.lang.builder.ToStringBuilder; diff --git a/eventuate-tram-commands-spring/build.gradle b/eventuate-tram-spring-commands/build.gradle similarity index 100% rename from eventuate-tram-commands-spring/build.gradle rename to eventuate-tram-spring-commands/build.gradle diff --git a/eventuate-tram-commands-spring/src/main/java/io/eventuate/tram/commands/spring/consumer/TramCommandConsumerConfiguration.java b/eventuate-tram-spring-commands/src/main/java/io/eventuate/tram/spring/commands/consumer/TramCommandConsumerConfiguration.java similarity index 91% rename from eventuate-tram-commands-spring/src/main/java/io/eventuate/tram/commands/spring/consumer/TramCommandConsumerConfiguration.java rename to eventuate-tram-spring-commands/src/main/java/io/eventuate/tram/spring/commands/consumer/TramCommandConsumerConfiguration.java index ab527a3c..e470ea36 100644 --- a/eventuate-tram-commands-spring/src/main/java/io/eventuate/tram/commands/spring/consumer/TramCommandConsumerConfiguration.java +++ b/eventuate-tram-spring-commands/src/main/java/io/eventuate/tram/spring/commands/consumer/TramCommandConsumerConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.commands.spring.consumer; +package io.eventuate.tram.spring.commands.consumer; import io.eventuate.tram.commands.consumer.CommandDispatcherFactory; import io.eventuate.tram.messaging.consumer.MessageConsumer; diff --git a/eventuate-tram-commands-spring/src/main/java/io/eventuate/tram/commands/spring/producer/TramCommandProducerConfiguration.java b/eventuate-tram-spring-commands/src/main/java/io/eventuate/tram/spring/commands/producer/TramCommandProducerConfiguration.java similarity index 91% rename from eventuate-tram-commands-spring/src/main/java/io/eventuate/tram/commands/spring/producer/TramCommandProducerConfiguration.java rename to eventuate-tram-spring-commands/src/main/java/io/eventuate/tram/spring/commands/producer/TramCommandProducerConfiguration.java index 0074ac44..659b683d 100644 --- a/eventuate-tram-commands-spring/src/main/java/io/eventuate/tram/commands/spring/producer/TramCommandProducerConfiguration.java +++ b/eventuate-tram-spring-commands/src/main/java/io/eventuate/tram/spring/commands/producer/TramCommandProducerConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.commands.spring.producer; +package io.eventuate.tram.spring.commands.producer; import io.eventuate.tram.commands.producer.CommandProducer; import io.eventuate.tram.commands.producer.CommandProducerImpl; diff --git a/eventuate-tram-consumer-common-spring/build.gradle b/eventuate-tram-spring-consumer-common/build.gradle similarity index 100% rename from eventuate-tram-consumer-common-spring/build.gradle rename to eventuate-tram-spring-consumer-common/build.gradle diff --git a/eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramConsumerBaseCommonConfiguration.java b/eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramConsumerBaseCommonConfiguration.java similarity index 96% rename from eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramConsumerBaseCommonConfiguration.java rename to eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramConsumerBaseCommonConfiguration.java index 05b2211f..cc8b1e54 100644 --- a/eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramConsumerBaseCommonConfiguration.java +++ b/eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramConsumerBaseCommonConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.common.spring; +package io.eventuate.tram.spring.consumer.common; import io.eventuate.tram.consumer.common.*; import io.eventuate.tram.messaging.common.MessageInterceptor; diff --git a/eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramConsumerCommonConfiguration.java b/eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramConsumerCommonConfiguration.java similarity index 95% rename from eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramConsumerCommonConfiguration.java rename to eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramConsumerCommonConfiguration.java index 206bb27c..0bf39542 100644 --- a/eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramConsumerCommonConfiguration.java +++ b/eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramConsumerCommonConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.common.spring; +package io.eventuate.tram.spring.consumer.common; import io.eventuate.tram.consumer.common.DecoratedMessageHandlerFactory; import io.eventuate.tram.consumer.common.MessageConsumerImpl; diff --git a/eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramNoopDuplicateMessageDetectorConfiguration.java b/eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramNoopDuplicateMessageDetectorConfiguration.java similarity index 90% rename from eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramNoopDuplicateMessageDetectorConfiguration.java rename to eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramNoopDuplicateMessageDetectorConfiguration.java index 4eecadf3..7cc57e08 100644 --- a/eventuate-tram-consumer-common-spring/src/main/java/io/eventuate/tram/consumer/common/spring/TramNoopDuplicateMessageDetectorConfiguration.java +++ b/eventuate-tram-spring-consumer-common/src/main/java/io/eventuate/tram/spring/consumer/common/TramNoopDuplicateMessageDetectorConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.common.spring; +package io.eventuate.tram.spring.consumer.common; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import io.eventuate.tram.consumer.common.NoopDuplicateMessageDetector; diff --git a/eventuate-tram-consumer-jdbc-spring/build.gradle b/eventuate-tram-spring-consumer-jdbc/build.gradle similarity index 74% rename from eventuate-tram-consumer-jdbc-spring/build.gradle rename to eventuate-tram-spring-consumer-jdbc/build.gradle index 480f3d83..6270dbe0 100644 --- a/eventuate-tram-consumer-jdbc-spring/build.gradle +++ b/eventuate-tram-spring-consumer-jdbc/build.gradle @@ -1,7 +1,7 @@ dependencies { compile project(":eventuate-tram-consumer-jdbc") - compile "io.eventuate.common:eventuate-common-jdbc-spring:$eventuateCommonVersion" + compile "io.eventuate.common:eventuate-common-spring-jdbc:$eventuateCommonVersion" testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" } \ No newline at end of file diff --git a/eventuate-tram-consumer-jdbc-spring/src/main/java/io/eventuate/tram/consumer/jdbc/spring/TramConsumerJdbcAutoConfiguration.java b/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java similarity index 91% rename from eventuate-tram-consumer-jdbc-spring/src/main/java/io/eventuate/tram/consumer/jdbc/spring/TramConsumerJdbcAutoConfiguration.java rename to eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java index 4e03dba6..951b74b6 100644 --- a/eventuate-tram-consumer-jdbc-spring/src/main/java/io/eventuate/tram/consumer/jdbc/spring/TramConsumerJdbcAutoConfiguration.java +++ b/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java @@ -1,10 +1,10 @@ -package io.eventuate.tram.consumer.jdbc.spring; +package io.eventuate.tram.spring.consumer.jdbc; import io.eventuate.common.jdbc.EventuateJdbcStatementExecutor; import io.eventuate.common.jdbc.EventuateSchema; import io.eventuate.common.jdbc.EventuateTransactionTemplate; -import io.eventuate.common.jdbc.spring.EventuateSchemaConfiguration; -import io.eventuate.common.jdbc.spring.sqldialect.SqlDialectConfiguration; +import io.eventuate.common.spring.jdbc.EventuateSchemaConfiguration; +import io.eventuate.common.spring.jdbc.sqldialect.SqlDialectConfiguration; import io.eventuate.common.jdbc.sqldialect.SqlDialectSelector; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import io.eventuate.tram.consumer.jdbc.SqlTableBasedDuplicateMessageDetector; diff --git a/eventuate-tram-consumer-jdbc-spring/src/main/java/io/eventuate/tram/consumer/jdbc/spring/TransactionalNoopDuplicateMessageDetectorConfiguration.java b/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TransactionalNoopDuplicateMessageDetectorConfiguration.java similarity index 92% rename from eventuate-tram-consumer-jdbc-spring/src/main/java/io/eventuate/tram/consumer/jdbc/spring/TransactionalNoopDuplicateMessageDetectorConfiguration.java rename to eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TransactionalNoopDuplicateMessageDetectorConfiguration.java index 5913d5b7..8bbf03bf 100644 --- a/eventuate-tram-consumer-jdbc-spring/src/main/java/io/eventuate/tram/consumer/jdbc/spring/TransactionalNoopDuplicateMessageDetectorConfiguration.java +++ b/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TransactionalNoopDuplicateMessageDetectorConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.consumer.jdbc.spring; +package io.eventuate.tram.spring.consumer.jdbc; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import io.eventuate.tram.consumer.jdbc.TransactionalNoopDuplicateMessageDetector; diff --git a/eventuate-tram-consumer-jdbc-spring/src/main/resources/META-INF/spring.factories b/eventuate-tram-spring-consumer-jdbc/src/main/resources/META-INF/spring.factories similarity index 53% rename from eventuate-tram-consumer-jdbc-spring/src/main/resources/META-INF/spring.factories rename to eventuate-tram-spring-consumer-jdbc/src/main/resources/META-INF/spring.factories index 04bd71ad..862b0c78 100644 --- a/eventuate-tram-consumer-jdbc-spring/src/main/resources/META-INF/spring.factories +++ b/eventuate-tram-spring-consumer-jdbc/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.eventuate.tram.consumer.jdbc.spring.TramConsumerJdbcAutoConfiguration +io.eventuate.tram.spring.consumer.jdbc.TramConsumerJdbcAutoConfiguration diff --git a/eventuate-tram-consumer-jdbc-spring/src/test/java/io/eventuate/tram/consumer/jdbc/spring/EventuateSpringSqlTableBasedDuplicateMessageDetectorTest.java b/eventuate-tram-spring-consumer-jdbc/src/test/java/io/eventuate/tram/spring/consumer/jdbc/EventuateSpringSqlTableBasedDuplicateMessageDetectorTest.java similarity index 92% rename from eventuate-tram-consumer-jdbc-spring/src/test/java/io/eventuate/tram/consumer/jdbc/spring/EventuateSpringSqlTableBasedDuplicateMessageDetectorTest.java rename to eventuate-tram-spring-consumer-jdbc/src/test/java/io/eventuate/tram/spring/consumer/jdbc/EventuateSpringSqlTableBasedDuplicateMessageDetectorTest.java index 497e29d0..19e4be1d 100644 --- a/eventuate-tram-consumer-jdbc-spring/src/test/java/io/eventuate/tram/consumer/jdbc/spring/EventuateSpringSqlTableBasedDuplicateMessageDetectorTest.java +++ b/eventuate-tram-spring-consumer-jdbc/src/test/java/io/eventuate/tram/spring/consumer/jdbc/EventuateSpringSqlTableBasedDuplicateMessageDetectorTest.java @@ -1,6 +1,6 @@ -package io.eventuate.tram.consumer.jdbc.spring; +package io.eventuate.tram.spring.consumer.jdbc; -import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration; +import io.eventuate.common.spring.jdbc.EventuateCommonJdbcOperationsConfiguration; import io.eventuate.tram.consumer.common.DuplicateMessageDetector; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/eventuate-tram-consumer-kafka-spring/build.gradle b/eventuate-tram-spring-consumer-kafka/build.gradle similarity index 68% rename from eventuate-tram-consumer-kafka-spring/build.gradle rename to eventuate-tram-spring-consumer-kafka/build.gradle index bbd1f338..4c823375 100644 --- a/eventuate-tram-consumer-kafka-spring/build.gradle +++ b/eventuate-tram-spring-consumer-kafka/build.gradle @@ -2,8 +2,8 @@ apply plugin: PublicModulePlugin dependencies { compile "org.springframework.boot:spring-boot-starter:$springBootVersion" - compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-consumer-spring:$eventuateMessagingKafkaVersion" - compile project(":eventuate-tram-consumer-common-spring") + compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-spring-consumer:$eventuateMessagingKafkaVersion" + compile project(":eventuate-tram-spring-consumer-common") compile project(":eventuate-tram-consumer-kafka") } diff --git a/eventuate-tram-consumer-kafka-spring/src/main/java/io/eventuate/tram/consumer/kafka/spring/EventuateTramKafkaMessageConsumerConfiguration.java b/eventuate-tram-spring-consumer-kafka/src/main/java/io/eventuate/tram/spring/consumer/kafka/EventuateTramKafkaMessageConsumerConfiguration.java similarity index 81% rename from eventuate-tram-consumer-kafka-spring/src/main/java/io/eventuate/tram/consumer/kafka/spring/EventuateTramKafkaMessageConsumerConfiguration.java rename to eventuate-tram-spring-consumer-kafka/src/main/java/io/eventuate/tram/spring/consumer/kafka/EventuateTramKafkaMessageConsumerConfiguration.java index 5e5cd6d9..5eb54213 100644 --- a/eventuate-tram-consumer-kafka-spring/src/main/java/io/eventuate/tram/consumer/kafka/spring/EventuateTramKafkaMessageConsumerConfiguration.java +++ b/eventuate-tram-spring-consumer-kafka/src/main/java/io/eventuate/tram/spring/consumer/kafka/EventuateTramKafkaMessageConsumerConfiguration.java @@ -1,9 +1,9 @@ -package io.eventuate.tram.consumer.kafka.spring; +package io.eventuate.tram.spring.consumer.kafka; import io.eventuate.messaging.kafka.consumer.MessageConsumerKafkaImpl; -import io.eventuate.messaging.kafka.consumer.spring.MessageConsumerKafkaConfiguration; +import io.eventuate.messaging.kafka.spring.consumer.MessageConsumerKafkaConfiguration; import io.eventuate.tram.consumer.common.MessageConsumerImplementation; -import io.eventuate.tram.consumer.common.spring.TramConsumerCommonConfiguration; +import io.eventuate.tram.spring.consumer.common.TramConsumerCommonConfiguration; import io.eventuate.tram.consumer.kafka.EventuateTramKafkaMessageConsumer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eventuate-tram-events-spring/build.gradle b/eventuate-tram-spring-events/build.gradle similarity index 75% rename from eventuate-tram-events-spring/build.gradle rename to eventuate-tram-spring-events/build.gradle index 6305a05e..668d4118 100644 --- a/eventuate-tram-events-spring/build.gradle +++ b/eventuate-tram-spring-events/build.gradle @@ -2,6 +2,7 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-events") + compile project(":eventuate-tram-spring-messaging") compile "org.springframework.boot:spring-boot-starter:$springBootVersion" } diff --git a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/common/TramEventsCommonAutoConfiguration.java b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java similarity index 92% rename from eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/common/TramEventsCommonAutoConfiguration.java rename to eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java index 3dba122f..f87d1de1 100644 --- a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/common/TramEventsCommonAutoConfiguration.java +++ b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.spring.common; +package io.eventuate.tram.spring.events.common; import io.eventuate.tram.events.common.DefaultDomainEventNameMapping; import io.eventuate.tram.events.common.DomainEventNameMapping; diff --git a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/publisher/TramEventsPublisherConfiguration.java b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/publisher/TramEventsPublisherConfiguration.java similarity index 92% rename from eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/publisher/TramEventsPublisherConfiguration.java rename to eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/publisher/TramEventsPublisherConfiguration.java index f6ed18ad..226876e5 100644 --- a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/publisher/TramEventsPublisherConfiguration.java +++ b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/publisher/TramEventsPublisherConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.spring.publisher; +package io.eventuate.tram.spring.events.publisher; import io.eventuate.tram.events.common.DomainEventNameMapping; import io.eventuate.tram.events.publisher.DomainEventPublisher; diff --git a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/subscriber/SpringDomainEventDispatcherFactory.java b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/subscriber/SpringDomainEventDispatcherFactory.java similarity index 94% rename from eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/subscriber/SpringDomainEventDispatcherFactory.java rename to eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/subscriber/SpringDomainEventDispatcherFactory.java index bc64acd8..b34b19ca 100644 --- a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/subscriber/SpringDomainEventDispatcherFactory.java +++ b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/subscriber/SpringDomainEventDispatcherFactory.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.spring.subscriber; +package io.eventuate.tram.spring.events.subscriber; import io.eventuate.tram.events.common.DomainEventNameMapping; import io.eventuate.tram.events.subscriber.DomainEventDispatcher; diff --git a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/subscriber/TramEventSubscriberConfiguration.java b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/subscriber/TramEventSubscriberConfiguration.java similarity index 92% rename from eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/subscriber/TramEventSubscriberConfiguration.java rename to eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/subscriber/TramEventSubscriberConfiguration.java index 4ebeb8d2..3de3204c 100644 --- a/eventuate-tram-events-spring/src/main/java/io/eventuate/tram/events/spring/subscriber/TramEventSubscriberConfiguration.java +++ b/eventuate-tram-spring-events/src/main/java/io/eventuate/tram/spring/events/subscriber/TramEventSubscriberConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.events.spring.subscriber; +package io.eventuate.tram.spring.events.subscriber; import io.eventuate.tram.events.common.DomainEventNameMapping; import io.eventuate.tram.events.subscriber.DomainEventDispatcherFactory; diff --git a/eventuate-tram-events-spring/src/main/resources/META-INF/spring.factories b/eventuate-tram-spring-events/src/main/resources/META-INF/spring.factories similarity index 53% rename from eventuate-tram-events-spring/src/main/resources/META-INF/spring.factories rename to eventuate-tram-spring-events/src/main/resources/META-INF/spring.factories index a453224d..ff71472b 100644 --- a/eventuate-tram-events-spring/src/main/resources/META-INF/spring.factories +++ b/eventuate-tram-spring-events/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.eventuate.tram.events.spring.common.TramEventsCommonAutoConfiguration +io.eventuate.tram.spring.events.common.TramEventsCommonAutoConfiguration diff --git a/eventuate-tram-spring-in-memory/build.gradle b/eventuate-tram-spring-in-memory/build.gradle new file mode 100644 index 00000000..b1b2241a --- /dev/null +++ b/eventuate-tram-spring-in-memory/build.gradle @@ -0,0 +1,16 @@ +apply plugin: PublicModulePlugin + +dependencies { + compile project(":eventuate-tram-in-memory") + + compile project(":eventuate-tram-spring-messaging") + compile project(":eventuate-tram-spring-consumer-common") + compile project(":eventuate-tram-spring-messaging-producer-common") + compile project(":eventuate-tram-spring-consumer-jdbc") + + compile "io.eventuate.common:eventuate-common-spring-in-memory-database:$eventuateCommonVersion" + + + testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" + +} \ No newline at end of file diff --git a/eventuate-tram-in-memory-spring/src/main/java/io/eventuate/tram/inmemory/spring/TramInMemoryCommonConfiguration.java b/eventuate-tram-spring-in-memory/src/main/java/io/eventuate/tram/spring/inmemory/TramInMemoryCommonConfiguration.java similarity index 81% rename from eventuate-tram-in-memory-spring/src/main/java/io/eventuate/tram/inmemory/spring/TramInMemoryCommonConfiguration.java rename to eventuate-tram-spring-in-memory/src/main/java/io/eventuate/tram/spring/inmemory/TramInMemoryCommonConfiguration.java index b89c4933..27d7e652 100644 --- a/eventuate-tram-in-memory-spring/src/main/java/io/eventuate/tram/inmemory/spring/TramInMemoryCommonConfiguration.java +++ b/eventuate-tram-spring-in-memory/src/main/java/io/eventuate/tram/spring/inmemory/TramInMemoryCommonConfiguration.java @@ -1,13 +1,13 @@ -package io.eventuate.tram.inmemory.spring; +package io.eventuate.tram.spring.inmemory; import io.eventuate.common.id.IdGenerator; import io.eventuate.common.id.IdGeneratorImpl; -import io.eventuate.common.inmemorydatabase.EventuateCommonInMemoryDatabaseConfiguration; +import io.eventuate.common.spring.inmemorydatabase.EventuateCommonInMemoryDatabaseConfiguration; import io.eventuate.common.inmemorydatabase.EventuateDatabaseScriptSupplier; -import io.eventuate.tram.consumer.common.spring.TramConsumerCommonConfiguration; +import io.eventuate.tram.spring.consumer.common.TramConsumerCommonConfiguration; import io.eventuate.tram.inmemory.InMemoryMessageConsumer; import io.eventuate.tram.inmemory.InMemoryMessageProducer; -import io.eventuate.tram.messaging.producer.common.TramMessagingCommonProducerConfiguration; +import io.eventuate.tram.spring.messaging.producer.common.TramMessagingCommonProducerConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-in-memory-spring/src/main/java/io/eventuate/tram/inmemory/spring/TramInMemoryConfiguration.java b/eventuate-tram-spring-in-memory/src/main/java/io/eventuate/tram/spring/inmemory/TramInMemoryConfiguration.java similarity index 75% rename from eventuate-tram-in-memory-spring/src/main/java/io/eventuate/tram/inmemory/spring/TramInMemoryConfiguration.java rename to eventuate-tram-spring-in-memory/src/main/java/io/eventuate/tram/spring/inmemory/TramInMemoryConfiguration.java index cc0ef8a5..4ff6e220 100644 --- a/eventuate-tram-in-memory-spring/src/main/java/io/eventuate/tram/inmemory/spring/TramInMemoryConfiguration.java +++ b/eventuate-tram-spring-in-memory/src/main/java/io/eventuate/tram/spring/inmemory/TramInMemoryConfiguration.java @@ -1,6 +1,6 @@ -package io.eventuate.tram.inmemory.spring; +package io.eventuate.tram.spring.inmemory; -import io.eventuate.tram.consumer.jdbc.spring.TransactionalNoopDuplicateMessageDetectorConfiguration; +import io.eventuate.tram.spring.consumer.jdbc.TransactionalNoopDuplicateMessageDetectorConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-in-memory-spring/src/test/java/io/eventuate/tram/inmemory/spring/InMemoryMessageProducerTest.java b/eventuate-tram-spring-in-memory/src/test/java/io/eventuate/tram/spring/inmemory/InMemoryMessageProducerTest.java similarity index 98% rename from eventuate-tram-in-memory-spring/src/test/java/io/eventuate/tram/inmemory/spring/InMemoryMessageProducerTest.java rename to eventuate-tram-spring-in-memory/src/test/java/io/eventuate/tram/spring/inmemory/InMemoryMessageProducerTest.java index ca205e38..d5f7d35d 100644 --- a/eventuate-tram-in-memory-spring/src/test/java/io/eventuate/tram/inmemory/spring/InMemoryMessageProducerTest.java +++ b/eventuate-tram-spring-in-memory/src/test/java/io/eventuate/tram/spring/inmemory/InMemoryMessageProducerTest.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.inmemory.spring; +package io.eventuate.tram.spring.inmemory; import io.eventuate.tram.inmemory.InMemoryMessageConsumer; import io.eventuate.tram.inmemory.InMemoryMessageProducer; diff --git a/eventuate-tram-spring-jdbc-kafka/build.gradle b/eventuate-tram-spring-jdbc-kafka/build.gradle new file mode 100644 index 00000000..928a4d89 --- /dev/null +++ b/eventuate-tram-spring-jdbc-kafka/build.gradle @@ -0,0 +1,10 @@ +apply plugin: PublicModulePlugin + +dependencies { + compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-spring-consumer:$eventuateMessagingKafkaVersion" + + compile project(":eventuate-tram-spring-producer-jdbc") + compile project(":eventuate-tram-spring-consumer-common") + compile project(":eventuate-tram-spring-consumer-jdbc") + compile project(":eventuate-tram-spring-consumer-kafka") +} \ No newline at end of file diff --git a/eventuate-tram-jdbc-kafka-spring/src/main/java/io/eventuate/tram/jdbckafka/TramJdbcKafkaConfiguration.java b/eventuate-tram-spring-jdbc-kafka/src/main/java/io/eventuate/tram/spring/jdbckafka/TramJdbcKafkaConfiguration.java similarity index 67% rename from eventuate-tram-jdbc-kafka-spring/src/main/java/io/eventuate/tram/jdbckafka/TramJdbcKafkaConfiguration.java rename to eventuate-tram-spring-jdbc-kafka/src/main/java/io/eventuate/tram/spring/jdbckafka/TramJdbcKafkaConfiguration.java index 68a320db..b8aafb4f 100644 --- a/eventuate-tram-jdbc-kafka-spring/src/main/java/io/eventuate/tram/jdbckafka/TramJdbcKafkaConfiguration.java +++ b/eventuate-tram-spring-jdbc-kafka/src/main/java/io/eventuate/tram/spring/jdbckafka/TramJdbcKafkaConfiguration.java @@ -1,7 +1,7 @@ -package io.eventuate.tram.jdbckafka; +package io.eventuate.tram.spring.jdbckafka; -import io.eventuate.tram.consumer.kafka.spring.EventuateTramKafkaMessageConsumerConfiguration; -import io.eventuate.tram.messaging.producer.jdbc.spring.TramMessageProducerJdbcConfiguration; +import io.eventuate.tram.spring.consumer.kafka.EventuateTramKafkaMessageConsumerConfiguration; +import io.eventuate.tram.spring.messaging.producer.jdbc.TramMessageProducerJdbcConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/eventuate-tram-messaging-producer-common-spring/build.gradle b/eventuate-tram-spring-messaging-producer-common/build.gradle similarity index 100% rename from eventuate-tram-messaging-producer-common-spring/build.gradle rename to eventuate-tram-spring-messaging-producer-common/build.gradle diff --git a/eventuate-tram-messaging-producer-common-spring/src/main/java/io/eventuate/tram/messaging/producer/common/TramMessagingCommonProducerConfiguration.java b/eventuate-tram-spring-messaging-producer-common/src/main/java/io/eventuate/tram/spring/messaging/producer/common/TramMessagingCommonProducerConfiguration.java similarity index 78% rename from eventuate-tram-messaging-producer-common-spring/src/main/java/io/eventuate/tram/messaging/producer/common/TramMessagingCommonProducerConfiguration.java rename to eventuate-tram-spring-messaging-producer-common/src/main/java/io/eventuate/tram/spring/messaging/producer/common/TramMessagingCommonProducerConfiguration.java index 99ad2a6c..fc685d34 100644 --- a/eventuate-tram-messaging-producer-common-spring/src/main/java/io/eventuate/tram/messaging/producer/common/TramMessagingCommonProducerConfiguration.java +++ b/eventuate-tram-spring-messaging-producer-common/src/main/java/io/eventuate/tram/spring/messaging/producer/common/TramMessagingCommonProducerConfiguration.java @@ -1,8 +1,10 @@ -package io.eventuate.tram.messaging.producer.common; +package io.eventuate.tram.spring.messaging.producer.common; import io.eventuate.tram.messaging.common.ChannelMapping; import io.eventuate.tram.messaging.common.MessageInterceptor; import io.eventuate.tram.messaging.producer.MessageProducer; +import io.eventuate.tram.messaging.producer.common.MessageProducerImpl; +import io.eventuate.tram.messaging.producer.common.MessageProducerImplementation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eventuate-tram-messaging-spring/build.gradle b/eventuate-tram-spring-messaging/build.gradle similarity index 100% rename from eventuate-tram-messaging-spring/build.gradle rename to eventuate-tram-spring-messaging/build.gradle diff --git a/eventuate-tram-messaging-spring/src/main/java/io/eventuate/tram/messaging/common/spring/TramMessagingCommonAutoConfiguration.java b/eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java similarity index 91% rename from eventuate-tram-messaging-spring/src/main/java/io/eventuate/tram/messaging/common/spring/TramMessagingCommonAutoConfiguration.java rename to eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java index 995b4f20..12d224b3 100644 --- a/eventuate-tram-messaging-spring/src/main/java/io/eventuate/tram/messaging/common/spring/TramMessagingCommonAutoConfiguration.java +++ b/eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.messaging.common.spring; +package io.eventuate.tram.spring.messaging.common; import io.eventuate.tram.messaging.common.ChannelMapping; import io.eventuate.tram.messaging.common.DefaultChannelMapping; diff --git a/eventuate-tram-messaging-spring/src/main/resources/META-INF/spring.factories b/eventuate-tram-spring-messaging/src/main/resources/META-INF/spring.factories similarity index 55% rename from eventuate-tram-messaging-spring/src/main/resources/META-INF/spring.factories rename to eventuate-tram-spring-messaging/src/main/resources/META-INF/spring.factories index 392b8db7..4e769ee4 100644 --- a/eventuate-tram-messaging-spring/src/main/resources/META-INF/spring.factories +++ b/eventuate-tram-spring-messaging/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.eventuate.tram.messaging.common.spring.TramMessagingCommonAutoConfiguration +io.eventuate.tram.spring.messaging.common.TramMessagingCommonAutoConfiguration diff --git a/eventuate-tram-spring-producer-jdbc/build.gradle b/eventuate-tram-spring-producer-jdbc/build.gradle new file mode 100644 index 00000000..2e368b90 --- /dev/null +++ b/eventuate-tram-spring-producer-jdbc/build.gradle @@ -0,0 +1,9 @@ +apply plugin: PublicModulePlugin + +dependencies { + compile project(":eventuate-tram-producer-jdbc") + compile project(":eventuate-tram-spring-messaging-producer-common") + + compile "io.eventuate.common:eventuate-common-spring-jdbc:$eventuateCommonVersion" +} + diff --git a/eventuate-tram-producer-jdbc-spring/src/main/java/io/eventuate/tram/messaging/producer/jdbc/spring/TramMessageProducerJdbcConfiguration.java b/eventuate-tram-spring-producer-jdbc/src/main/java/io/eventuate/tram/spring/messaging/producer/jdbc/TramMessageProducerJdbcConfiguration.java similarity index 83% rename from eventuate-tram-producer-jdbc-spring/src/main/java/io/eventuate/tram/messaging/producer/jdbc/spring/TramMessageProducerJdbcConfiguration.java rename to eventuate-tram-spring-producer-jdbc/src/main/java/io/eventuate/tram/spring/messaging/producer/jdbc/TramMessageProducerJdbcConfiguration.java index 47730022..37c20879 100644 --- a/eventuate-tram-producer-jdbc-spring/src/main/java/io/eventuate/tram/messaging/producer/jdbc/spring/TramMessageProducerJdbcConfiguration.java +++ b/eventuate-tram-spring-producer-jdbc/src/main/java/io/eventuate/tram/spring/messaging/producer/jdbc/TramMessageProducerJdbcConfiguration.java @@ -1,16 +1,15 @@ -package io.eventuate.tram.messaging.producer.jdbc.spring; +package io.eventuate.tram.spring.messaging.producer.jdbc; import io.eventuate.common.id.IdGenerator; import io.eventuate.common.id.IdGeneratorImpl; import io.eventuate.common.jdbc.EventuateCommonJdbcOperations; import io.eventuate.common.jdbc.EventuateSchema; -import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration; -import io.eventuate.common.jdbc.spring.EventuateSchemaConfiguration; -import io.eventuate.common.jdbc.spring.sqldialect.SqlDialectConfiguration; +import io.eventuate.common.spring.jdbc.EventuateCommonJdbcOperationsConfiguration; +import io.eventuate.common.spring.jdbc.sqldialect.SqlDialectConfiguration; import io.eventuate.common.jdbc.sqldialect.SqlDialectSelector; import io.eventuate.tram.messaging.producer.common.MessageProducerImplementation; -import io.eventuate.tram.messaging.producer.common.TramMessagingCommonProducerConfiguration; import io.eventuate.tram.messaging.producer.jdbc.MessageProducerJdbcImpl; +import io.eventuate.tram.spring.messaging.producer.common.TramMessagingCommonProducerConfiguration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eventuate-tram-testing-support-spring-cloud-contract/build.gradle b/eventuate-tram-spring-testing-support-cloud-contract/build.gradle similarity index 100% rename from eventuate-tram-testing-support-spring-cloud-contract/build.gradle rename to eventuate-tram-spring-testing-support-cloud-contract/build.gradle diff --git a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateContractVerifierConfiguration.java b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateContractVerifierConfiguration.java similarity index 92% rename from eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateContractVerifierConfiguration.java rename to eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateContractVerifierConfiguration.java index 00127566..c8c54eaa 100644 --- a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateContractVerifierConfiguration.java +++ b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateContractVerifierConfiguration.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudcontractsupport; +package io.eventuate.tram.spring.cloudcontractsupport; import io.eventuate.tram.messaging.common.Message; import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; diff --git a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateContractVerifierMessaging.java b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateContractVerifierMessaging.java similarity index 93% rename from eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateContractVerifierMessaging.java rename to eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateContractVerifierMessaging.java index 9985f75d..c2422ab1 100644 --- a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateContractVerifierMessaging.java +++ b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateContractVerifierMessaging.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudcontractsupport; +package io.eventuate.tram.spring.cloudcontractsupport; import io.eventuate.tram.messaging.common.Message; import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; diff --git a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateTramMessageVerifier.java b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateTramMessageVerifier.java similarity index 97% rename from eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateTramMessageVerifier.java rename to eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateTramMessageVerifier.java index eb1bd6d6..557b2a5a 100644 --- a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateTramMessageVerifier.java +++ b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateTramMessageVerifier.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudcontractsupport; +package io.eventuate.tram.spring.cloudcontractsupport; import io.eventuate.tram.messaging.common.Message; import io.eventuate.tram.messaging.consumer.MessageConsumer; diff --git a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateTramRoutesConfigurer.java b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateTramRoutesConfigurer.java similarity index 99% rename from eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateTramRoutesConfigurer.java rename to eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateTramRoutesConfigurer.java index 4ba0bc38..1a38672a 100644 --- a/eventuate-tram-testing-support-spring-cloud-contract/src/main/java/io/eventuate/tram/springcloudcontractsupport/EventuateTramRoutesConfigurer.java +++ b/eventuate-tram-spring-testing-support-cloud-contract/src/main/java/io/eventuate/tram/spring/cloudcontractsupport/EventuateTramRoutesConfigurer.java @@ -1,4 +1,4 @@ -package io.eventuate.tram.springcloudcontractsupport; +package io.eventuate.tram.spring.cloudcontractsupport; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; diff --git a/eventuate-tram-test-util/build.gradle b/eventuate-tram-test-util/build.gradle index 931cde8c..d2b8e342 100644 --- a/eventuate-tram-test-util/build.gradle +++ b/eventuate-tram-test-util/build.gradle @@ -2,7 +2,7 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-events") - compile project(":eventuate-tram-commands-spring") + compile project(":eventuate-tram-spring-commands") compile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion" compile "junit:junit:4.12" diff --git a/eventuate-tram-testing-support/build.gradle b/eventuate-tram-testing-support/build.gradle index b9e32250..081d72d0 100644 --- a/eventuate-tram-testing-support/build.gradle +++ b/eventuate-tram-testing-support/build.gradle @@ -2,12 +2,12 @@ apply plugin: PublicModulePlugin dependencies { compile project(":eventuate-tram-messaging") - compile project(":eventuate-tram-commands-spring") - compile project(":eventuate-tram-events-spring") + compile project(":eventuate-tram-spring-commands") + compile project(":eventuate-tram-spring-events") compile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion" compile "junit:junit:4.12" testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion" - testCompile project(":eventuate-tram-in-memory-spring") + testCompile project(":eventuate-tram-spring-in-memory") } diff --git a/eventuate-tram-testing-support/src/test/java/io/eventuate/tram/testing/MessageTrackerTest.java b/eventuate-tram-testing-support/src/test/java/io/eventuate/tram/testing/MessageTrackerTest.java index c164b363..2cc727b6 100644 --- a/eventuate-tram-testing-support/src/test/java/io/eventuate/tram/testing/MessageTrackerTest.java +++ b/eventuate-tram-testing-support/src/test/java/io/eventuate/tram/testing/MessageTrackerTest.java @@ -2,11 +2,11 @@ import io.eventuate.tram.commands.common.Command; import io.eventuate.tram.commands.producer.CommandProducer; -import io.eventuate.tram.commands.spring.producer.TramCommandProducerConfiguration; +import io.eventuate.tram.spring.commands.producer.TramCommandProducerConfiguration; import io.eventuate.tram.events.common.DomainEvent; import io.eventuate.tram.events.publisher.DomainEventPublisher; -import io.eventuate.tram.events.spring.publisher.TramEventsPublisherConfiguration; -import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration; +import io.eventuate.tram.spring.events.publisher.TramEventsPublisherConfiguration; +import io.eventuate.tram.spring.inmemory.TramInMemoryConfiguration; import io.eventuate.tram.messaging.consumer.MessageConsumer; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/gradle.properties b/gradle.properties index 12b14c51..17732424 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,8 @@ springDependencyManagementPluginVersion=1.0.3.RELEASE springCloudSleuthVersion=2.0.2.RELEASE dockerComposePluginVersion=0.6.6 eventuateCdcVersion=0.4.0.RELEASE -eventuateCommonVersion=0.9.0.RC2 -eventuateMessagingKafkaVersion=0.9.0.RC1 +eventuateCommonVersion=0.8.3-SNAPSHOT +eventuateMessagingKafkaVersion=0.5.0-SNAPSHOT eventuateMessagingActiveMQVersion=0.6.0.RC1 eventuateMessagingRabbitMQVersion=0.7.0.RC1 eventuateMessagingRedisVersion=0.7.0.RC1 diff --git a/settings.gradle b/settings.gradle index b13b0fe9..aefcf769 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,22 +1,22 @@ include 'eventuate-tram-messaging-producer-common' -include 'eventuate-tram-messaging-producer-common-spring' -include 'eventuate-tram-messaging-producer-common-micronaut' +include 'eventuate-tram-spring-messaging-producer-common' +include 'eventuate-tram-micronaut-messaging-producer-common' include 'eventuate-tram-messaging' -include 'eventuate-tram-messaging-spring' -include 'eventuate-tram-messaging-micronaut' +include 'eventuate-tram-spring-messaging' +include 'eventuate-tram-micronaut-messaging' include 'eventuate-tram-producer-jdbc' -include 'eventuate-tram-producer-jdbc-spring' -include 'eventuate-tram-producer-jdbc-micronaut' +include 'eventuate-tram-spring-producer-jdbc' +include 'eventuate-tram-micronaut-producer-jdbc' include 'eventuate-tram-in-memory' -include 'eventuate-tram-in-memory-spring' -include 'eventuate-tram-in-memory-micronaut' +include 'eventuate-tram-spring-in-memory' +include 'eventuate-tram-micronaut-in-memory' include 'eventuate-tram-consumer-common' -include 'eventuate-tram-consumer-common-spring' -include 'eventuate-tram-consumer-common-micronaut' +include 'eventuate-tram-spring-consumer-common' +include 'eventuate-tram-micronaut-consumer-common' include 'eventuate-tram-consumer-jdbc' -include 'eventuate-tram-consumer-jdbc-spring' -include 'eventuate-tram-consumer-jdbc-micronaut' -include 'eventuate-tram-jdbc-kafka-spring' +include 'eventuate-tram-spring-consumer-jdbc' +include 'eventuate-tram-micronaut-consumer-jdbc' +include 'eventuate-tram-spring-jdbc-kafka' include 'eventuate-tram-jdbc-activemq' include 'eventuate-tram-jdbc-rabbitmq' include 'eventuate-tram-jdbc-redis' @@ -24,19 +24,19 @@ include 'eventuate-tram-db-broker-integration-test' include 'eventuate-tram-integration-test-common' include 'eventuate-tram-commands-db-broker-integration-test' include 'eventuate-tram-events' -include 'eventuate-tram-events-spring' -include 'eventuate-tram-events-micronaut' +include 'eventuate-tram-spring-events' +include 'eventuate-tram-micronaut-events' include 'eventuate-tram-commands' -include 'eventuate-tram-commands-spring' -include 'eventuate-tram-commands-micronaut' +include 'eventuate-tram-spring-commands' +include 'eventuate-tram-micronaut-commands' include 'eventuate-tram-test-util' include "eventuate-tram-testing-support" -include "eventuate-tram-testing-support-spring-cloud-contract" +include "eventuate-tram-spring-testing-support-cloud-contract" include "eventuate-tram-aggregate-domain-events" include "eventuate-tram-spring-cloud-sleuth-integration" include 'eventuate-tram-consumer-kafka' -include 'eventuate-tram-consumer-kafka-spring' -include 'eventuate-tram-consumer-kafka-micronaut' +include 'eventuate-tram-spring-consumer-kafka' +include 'eventuate-tram-micronaut-consumer-kafka' include 'eventuate-tram-consumer-activemq' include 'eventuate-tram-consumer-rabbitmq' include 'eventuate-tram-consumer-redis'