Skip to content

Commit 1682bbf

Browse files
IS-2477: Remove unused kafka embedded (#529)
1 parent bc59156 commit 1682bbf

File tree

4 files changed

+1
-27
lines changed

4 files changed

+1
-27
lines changed

build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ val jsonVersion = "20240303"
1616
val jettyVersion = "9.4.54.v20240208"
1717
val joseVersion = "0.9.4"
1818
val kafkaVersion = "3.7.0"
19-
val kafkaEmbeddedVersion = "3.2.5"
2019
val ktorVersion = "2.3.11"
2120
val kluentVersion = "1.73"
2221
val jaxbApiVersion = "2.3.1"
@@ -191,7 +190,6 @@ dependencies {
191190
}
192191
}
193192
}
194-
testImplementation("no.nav:kafka-embedded-env:$kafkaEmbeddedVersion", excludeLog4j)
195193

196194
implementation("no.nav.tjenestespesifikasjoner:servicemeldingMedKontaktinformasjon-v1-tjenestespesifikasjon:$tjenesteSpesifikasjonerGithubVersion")
197195

src/test/kotlin/no/nav/syfo/testhelper/ExternalMockEnvironment.kt

-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package no.nav.syfo.testhelper
22

33
import io.ktor.server.netty.*
4-
import no.nav.common.KafkaEnvironment
54
import no.nav.syfo.application.ApplicationState
65
import no.nav.syfo.testhelper.mock.*
76
import java.util.*
87

98
class ExternalMockEnvironment private constructor() {
109
val applicationState: ApplicationState = testAppState()
1110
val database = TestDatabase()
12-
val embeddedEnvironment: KafkaEnvironment = testKafka()
1311
val azureAdV2Mock = AzureAdV2Mock()
1412
val tokendingsMock = TokendingsMock()
1513
val dokarkivMock = DokarkivMock()
@@ -37,7 +35,6 @@ class ExternalMockEnvironment private constructor() {
3735
)
3836

3937
var environment = testEnvironment(
40-
kafkaBootstrapServers = embeddedEnvironment.brokersURL,
4138
azureTokenEndpoint = azureAdV2Mock.url,
4239
tokenxEndpoint = tokendingsMock.url,
4340
dokarkivUrl = dokarkivMock.url,
@@ -70,14 +67,12 @@ class ExternalMockEnvironment private constructor() {
7067

7168
fun ExternalMockEnvironment.startExternalMocks() {
7269
this.externalApplicationMockMap.start()
73-
this.embeddedEnvironment.start()
7470
this.redisServer.start()
7571
}
7672

7773
fun ExternalMockEnvironment.stopExternalMocks() {
7874
this.externalApplicationMockMap.stop()
7975
this.database.stop()
80-
this.embeddedEnvironment.tearDown()
8176
this.redisServer.stop()
8277
}
8378

src/test/kotlin/no/nav/syfo/testhelper/TestEnvironment.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import java.net.ServerSocket
88
import java.time.LocalDate
99

1010
fun testEnvironment(
11-
kafkaBootstrapServers: String,
1211
dokarkivUrl: String = "http://dokarkiv",
1312
azureTokenEndpoint: String = "azureTokenEndpoint",
1413
tokenxEndpoint: String = "tokenxEndpoint",
@@ -36,7 +35,7 @@ fun testEnvironment(
3635
eregUrl = eregUrl,
3736
electorPath = "electorPath",
3837
kafka = ApplicationEnvironmentKafka(
39-
aivenBootstrapServers = kafkaBootstrapServers,
38+
aivenBootstrapServers = "kafkaBootstrapServers",
4039
aivenSchemaRegistryUrl = "http://kafka-schema-registry.tpa.svc.nais.local:8081",
4140
aivenRegistryUser = "registryuser",
4241
aivenRegistryPassword = "registrypassword",

src/test/kotlin/no/nav/syfo/testhelper/TestKafka.kt

-18
This file was deleted.

0 commit comments

Comments
 (0)