Setting containers as vals vs vars (#62)

testcontainers · Jun 18, 2019 · ef3e2d7 · ef3e2d7
1 parent 2a2ee80
commit ef3e2d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/main/scala/com/dimafeng/testcontainers/CassandraContainer.scala b/src/main/scala/com/dimafeng/testcontainers/CassandraContainer.scala
@@ -9,12 +9,12 @@ class CassandraContainer(dockerImageNameOverride: Option[String] = None,
 
   type OTCContainer = OTCGenericContainer[T] forSome {type T <: OTCCassandraContainer[T]}
 
-  var cassandraContainer: OTCCassandraContainer[Nothing] = null
-
-  if (dockerImageNameOverride.isEmpty) {
-    cassandraContainer = new OTCCassandraContainer()
-  } else {
-    cassandraContainer = new OTCCassandraContainer(dockerImageNameOverride.get)
+  val cassandraContainer: OTCCassandraContainer[Nothing] = {
+    if (dockerImageNameOverride.isEmpty) {
+      new OTCCassandraContainer()
+    } else {
+      new OTCCassandraContainer(dockerImageNameOverride.get)
+    }
   }
 
   if (configurationOverride.isDefined) cassandraContainer.withConfigurationOverride(configurationOverride.get)
@@ -37,4 +37,4 @@ object CassandraContainer {
     jmxReporting
   )
 
-}
+}
diff --git a/src/main/scala/com/dimafeng/testcontainers/KafkaContainer.scala b/src/main/scala/com/dimafeng/testcontainers/KafkaContainer.scala
@@ -7,12 +7,12 @@ class KafkaContainer(confluentPlatformVersion: Option[String] = None,
 
   type OTCContainer = OTCGenericContainer[T] forSome {type T <: OTCKafkaContainer}
 
-  var kafkaContainer: OTCKafkaContainer = null
-
-  if (confluentPlatformVersion.isEmpty) {
-    kafkaContainer = new OTCKafkaContainer()
-  } else {
-    kafkaContainer = new OTCKafkaContainer(confluentPlatformVersion.get)
+  val kafkaContainer: OTCKafkaContainer = {
+    if (confluentPlatformVersion.isEmpty) {
+      new OTCKafkaContainer()
+    } else {
+      new OTCKafkaContainer(confluentPlatformVersion.get)
+    }
   }
 
   if (externalZookeeper.isEmpty) {
@@ -30,4 +30,4 @@ object KafkaContainer {
             externalZookeeper: String = null): KafkaContainer = {
     new KafkaContainer(Option(confluentPlatformVersion), Option(externalZookeeper))
   }
-}
+}