Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: rid of deprecated class #209

Merged
merged 1 commit into from
Feb 16, 2022
Merged

chore: rid of deprecated class #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions modules/kafka/src/main/scala/com/dimafeng/testcontainers/KafkaContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,29 @@
package com.dimafeng.testcontainers

import org.testcontainers.containers.{KafkaContainer => JavaKafkaContainer}
import org.testcontainers.utility.DockerImageName

class KafkaContainer(confluentPlatformVersion: Option[String] = None,
externalZookeeper: Option[String] = None) extends SingleContainer[JavaKafkaContainer] {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this argument been removed on purpose? It doesn't seem to be deprecated in the Java lib

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you about externalZookeeper?

If yes. Then by default externalZookeeperConnect = null in Java lib, so then we do not need pass any value, cause by default we will use embeddedZookeeper (because method withEmbeddedZookeeper returns externalZookeeperConnect = null).
And if anyone wants to use externalZookeeper they should use configure method (as written above the val kafkaContainer )

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for vague question, and yes, I was asking about externalZookeeperConnect.

Thank you, it makes sense!

case class KafkaContainer(dockerImageName: DockerImageName = DockerImageName.parse(KafkaContainer.defaultDockerImageName)
) extends SingleContainer[JavaKafkaContainer] {

@deprecated("Please use reflective methods of the scala container or `configure` method")
val kafkaContainer: JavaKafkaContainer = {
if (confluentPlatformVersion.isEmpty) {
new JavaKafkaContainer()
} else {
new JavaKafkaContainer(confluentPlatformVersion.get)
}
}

if (externalZookeeper.isEmpty) {
kafkaContainer.withEmbeddedZookeeper()
} else {
kafkaContainer.withExternalZookeeper(externalZookeeper.get)
}

override val container: JavaKafkaContainer = kafkaContainer
override val container: JavaKafkaContainer = new JavaKafkaContainer(dockerImageName)

def bootstrapServers: String = container.getBootstrapServers
}

object KafkaContainer {

val defaultImage = "confluentinc/cp-kafka"
val defaultTag = "5.2.1"
val defaultDockerImageName = s"$defaultImage:$defaultTag"

def apply(confluentPlatformVersion: String = null,
externalZookeeper: String = null): KafkaContainer = {
new KafkaContainer(Option(confluentPlatformVersion), Option(externalZookeeper))
}

case class Def(
confluentPlatformVersion: String = defaultTag,
externalZookeeper: Option[String] = None
) extends ContainerDef {
case class Def(dockerImageName: DockerImageName = DockerImageName.parse(KafkaContainer.defaultDockerImageName)
) extends ContainerDef {

override type Container = KafkaContainer

override def createContainer(): KafkaContainer = {
new KafkaContainer(
confluentPlatformVersion = Some(confluentPlatformVersion),
externalZookeeper = externalZookeeper
)
new KafkaContainer(dockerImageName)
}
}
}
}
23 changes: 12 additions & 11 deletions ...les/kafka/src/test/scala/com/dimafeng/testcontainers/integration/SchemaRegistrySpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.apache.kafka.common.serialization.StringDeserializer
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import org.testcontainers.containers.Network
import org.testcontainers.utility.DockerImageName

import java.util.Properties
import scala.collection.JavaConverters._
Expand All @@ -26,26 +27,26 @@ class SchemaRegistrySpec extends AnyFlatSpec with ForAllTestContainer with Match
//a way to communicate containers
val network: Network = Network.newNetwork()

val kafkaContainer: KafkaContainer = KafkaContainer.Def(kafkaVersion).createContainer()
val kafkaContainer: KafkaContainer = KafkaContainer.Def(DockerImageName.parse(s"confluentinc/cp-kafka:$kafkaVersion")).createContainer()
val schemaRegistryContainer: GenericContainer = SchemaRegistryContainer.Def(network, hostName, kafkaVersion).createContainer()

kafkaContainer.container
.withNetwork(network)
.withNetworkAliases(hostName)
.withEnv(
Map[String, String](
"KAFKA_BROKER_ID" -> brokerId.toString,
"KAFKA_HOST_NAME" -> hostName,
"KAFKA_AUTO_CREATE_TOPICS_ENABLE" -> "false"
).asJava
)
.withNetwork(network)
.withNetworkAliases(hostName)
.withEnv(
Map[String, String](
"KAFKA_BROKER_ID" -> brokerId.toString,
"KAFKA_HOST_NAME" -> hostName,
"KAFKA_AUTO_CREATE_TOPICS_ENABLE" -> "false"
).asJava
)

override val container: MultipleContainers = MultipleContainers(kafkaContainer, schemaRegistryContainer)

def getKafkaAddress: String = kafkaContainer.bootstrapServers

def getSchemaRegistryAddress: String =
s"http://${schemaRegistryContainer.container.getHost}:${schemaRegistryContainer.container.getMappedPort(SchemaRegistryContainer.defaultSchemaPort)}"
s"http://${schemaRegistryContainer.container.getHost}:${schemaRegistryContainer.container.getMappedPort(SchemaRegistryContainer.defaultSchemaPort)}"


"Schema registry container" should "be started" in {
Expand Down