diff --git a/README.md b/README.md index bae09d7..227a01f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ Framework Database - Postgresql - with Flyway -- Redis - RabbitMQ Infra diff --git a/build.gradle.kts b/build.gradle.kts index 79a446e..00684f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,7 +81,6 @@ dependencies { implementation("io.github.oshai:kotlin-logging-jvm:${kotlinLoggingVersion.get()}") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:${kotlinSerializationVersion.get()}") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2") - implementation("redis.clients:jedis:5.2.0") implementation("org.postgresql:postgresql:42.7.13") implementation("com.zaxxer:HikariCP:6.3.0") implementation("com.rabbitmq:amqp-client:5.25.0") diff --git a/doc/installation.md b/doc/installation.md index 7a55f14..79b7c12 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -25,11 +25,9 @@ Api url: Exposed url on dev env: - [PostgreSql](http://localhost:5432/) -- [Redis](http://localhost:6379/) - [RabbitMQ](http://localhost:15672/) Admin service URL: - [Træfik dashboard](http://traefik.traefik.me/) -- [Redis insight](http://insight.redis.traefik.me/) - [pgAdmin](http://pgadmin.postgresql.traefik.me/) - [RabbitMQ management](http://management.rabbitmq.traefik.me/) \ No newline at end of file diff --git a/docker/.env.docker b/docker/.env.docker index ab6a6cf..2a52e31 100644 --- a/docker/.env.docker +++ b/docker/.env.docker @@ -1,3 +1,2 @@ -REDIS_URL=redis://redis:6379 POSTGRESQL_URL=jdbc:postgresql://postgresql/event-demo RABBITMQ_URL=rabbitmq diff --git a/docker/parts/docker-compose-app.yaml b/docker/parts/docker-compose-app.yaml index 59a1b91..767592b 100644 --- a/docker/parts/docker-compose-app.yaml +++ b/docker/parts/docker-compose-app.yaml @@ -10,8 +10,6 @@ services: condition: service_healthy rabbitmq: condition: service_healthy - redis: - condition: service_healthy env_file: - ../.env.docker labels: diff --git a/docker/parts/docker-compose-databases-expose.yaml b/docker/parts/docker-compose-databases-expose.yaml index d5b0774..e79ae48 100644 --- a/docker/parts/docker-compose-databases-expose.yaml +++ b/docker/parts/docker-compose-databases-expose.yaml @@ -1,8 +1,4 @@ services: - redis: - ports: - - "6379:6379" - postgresql: ports: - "5432:5432" diff --git a/docker/parts/docker-compose-databases.yaml b/docker/parts/docker-compose-databases.yaml index 491d9bd..eed86b1 100644 --- a/docker/parts/docker-compose-databases.yaml +++ b/docker/parts/docker-compose-databases.yaml @@ -1,12 +1,4 @@ services: - redis: - image: redis/redis-stack:7.4.0-v8 - healthcheck: - test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] - volumes: - - redis_data:/data - - redisinsight_data:/redisinsight - flyway: image: flyway/flyway command: migrate @@ -45,7 +37,5 @@ services: - rabbitmq_data:/var/lib/rabbitmq/ volumes: - redis_data: - redisinsight_data: postgresql_data: rabbitmq_data: \ No newline at end of file diff --git a/docker/parts/docker-compose-test.yaml b/docker/parts/docker-compose-test.yaml index d36f9f9..39d832e 100644 --- a/docker/parts/docker-compose-test.yaml +++ b/docker/parts/docker-compose-test.yaml @@ -13,8 +13,6 @@ services: condition: service_healthy rabbitmq: condition: service_healthy - redis: - condition: service_healthy env_file: - ../.env.docker diff --git a/docker/parts/docker-compose-tools.yaml b/docker/parts/docker-compose-tools.yaml index d5d9be0..690b377 100644 --- a/docker/parts/docker-compose-tools.yaml +++ b/docker/parts/docker-compose-tools.yaml @@ -12,12 +12,6 @@ services: - "traefik.http.routers.pgadmin.rule=Host(`pgadmin.postgresql.traefik.me`)" - "traefik.http.services.pgadmin.loadbalancer.server.port=80" - redis: - labels: - - "traefik.http.routers.redisinsight.rule=Host(`insight.redis.traefik.me`)" - - "traefik.http.routers.redisinsight.service=redisinsight" - - "traefik.http.services.redisinsight.loadbalancer.server.port=8001" - rabbitmq: labels: - "traefik.http.routers.rabbitmq-management.rule=Host(`management.rabbitmq.traefik.me`)" diff --git a/src/main/kotlin/eventDemo/configuration/Configuration.kt b/src/main/kotlin/eventDemo/configuration/Configuration.kt index 0ee7d73..d86b451 100644 --- a/src/main/kotlin/eventDemo/configuration/Configuration.kt +++ b/src/main/kotlin/eventDemo/configuration/Configuration.kt @@ -3,7 +3,6 @@ package eventDemo.configuration import io.ktor.server.config.ApplicationConfig data class Configuration( - val redisUrl: String, val jwtSecret: String, val postgresql: Postgresql, val rabbitmq: RabbitMQ, @@ -25,7 +24,6 @@ data class Configuration( val ApplicationConfig.configuration get() = Configuration( - redisUrl = getProperty("redis.url"), jwtSecret = getProperty("jwt.secret"), postgresql = Configuration.Postgresql( diff --git a/src/main/kotlin/eventDemo/configuration/ConfigureDIDataSources.kt b/src/main/kotlin/eventDemo/configuration/ConfigureDIDataSources.kt index 9a7c972..3a98832 100644 --- a/src/main/kotlin/eventDemo/configuration/ConfigureDIDataSources.kt +++ b/src/main/kotlin/eventDemo/configuration/ConfigureDIDataSources.kt @@ -7,8 +7,6 @@ import org.koin.core.module.Module import org.koin.core.scope.Scope import org.koin.core.scope.ScopeCallback import org.koin.dsl.bind -import redis.clients.jedis.JedisPooled -import redis.clients.jedis.UnifiedJedis import javax.sql.DataSource fun Module.configureDIDataSource(config: Configuration) { @@ -26,11 +24,6 @@ fun Module.configureDIDataSource(config: Configuration) { } } bind DataSource::class - // Redis (for Projections) - single { - JedisPooled(config.redisUrl) - } bind UnifiedJedis::class - // RabbitMQ (for EventBus) factory { ConnectionFactory().apply { diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 66a0f43..1e9c5d0 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -12,11 +12,6 @@ jwt { secret = ${?JWT_SECRET} } -redis { - url = "redis://localhost:6379" - url = ${?REDIS_URL} -} - postgresql { url = "jdbc:postgresql://localhost:5432/event-demo" url = ${?POSTGRESQL_URL} diff --git a/src/test/kotlin/eventDemo/Tag.kt b/src/test/kotlin/eventDemo/Tag.kt index 8824ac4..7e2366d 100644 --- a/src/test/kotlin/eventDemo/Tag.kt +++ b/src/test/kotlin/eventDemo/Tag.kt @@ -7,7 +7,5 @@ object Tag { object RabbitMQ : Tag() - object Redis : Tag() - object Concurrence : Tag() } diff --git a/src/test/kotlin/eventDemo/contexts/game/intrastructure/persistence/connectors/RedisTest.kt b/src/test/kotlin/eventDemo/contexts/game/intrastructure/persistence/connectors/RedisTest.kt deleted file mode 100644 index 9ac04cb..0000000 --- a/src/test/kotlin/eventDemo/contexts/game/intrastructure/persistence/connectors/RedisTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package eventDemo.contexts.game.intrastructure.persistence.connectors - -import eventDemo.Tag -import eventDemo.testHelpers.testKoinApplicationWithConfig -import io.kotest.core.spec.style.FunSpec -import io.kotest.matchers.equals.shouldBeEqual -import redis.clients.jedis.UnifiedJedis - -class RedisTest : - FunSpec({ - tags(Tag.Redis) - - test("test connection with jedis") { - testKoinApplicationWithConfig { - get().also { - it.set("test", "test") - it.get("test") shouldBeEqual "test" - } - } - } - }) diff --git a/src/test/kotlin/eventDemo/testHelpers/TestDataHelper.kt b/src/test/kotlin/eventDemo/testHelpers/TestDataHelper.kt index 8098560..0abdf3e 100644 --- a/src/test/kotlin/eventDemo/testHelpers/TestDataHelper.kt +++ b/src/test/kotlin/eventDemo/testHelpers/TestDataHelper.kt @@ -1,7 +1,6 @@ package eventDemo.testHelpers import org.koin.core.Koin -import redis.clients.jedis.UnifiedJedis import javax.sql.DataSource fun DataSource.cleanEventSource() { @@ -17,11 +16,6 @@ fun DataSource.cleanEventSource() { } } -fun UnifiedJedis.cleanProjections() { - flushAll() -} - fun Koin.cleanDataTest() { get().cleanEventSource() - get().cleanProjections() }