style: Reformat

j5ik2o · Apr 19, 2021 · ea90103 · ea90103
1 parent 5cbda49
commit ea90103
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/...oller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerMachineEnv.scala b/...oller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerMachineEnv.scala
@@ -12,7 +12,7 @@ case class DockerMachineEnv(tlsVerify: Boolean, dockerHost: String, dockerCertPa
 }
 
 object DockerMachineEnv {
-  private val logger = LoggerFactory.getLogger(getClass)
+  LoggerFactory.getLogger(getClass)
 
   private val tlsVerifyRegex: Regex = """export DOCKER_TLS_VERIFY="(.*)"""".r
 

diff --git a/...-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeControllerSpec.scala b/...-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeControllerSpec.scala
@@ -31,7 +31,7 @@ class DockerComposeControllerSpec extends AnyFreeSpec with BeforeAndAfter with B
 
   val url = new URL(s"http://$host:$hostPort")
 
-  def wget = {
+  def wget: Unit = {
     var connection: HttpURLConnection = null
     var in: InputStream               = null
     try {

diff --git a/...r-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerControllerSpec.scala b/...r-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerControllerSpec.scala
@@ -1,7 +1,6 @@
 package com.github.j5ik2o.dockerController
 
 import com.github.dockerjava.api.DockerClient
-import com.github.dockerjava.api.command.CreateContainerCmd
 import com.github.dockerjava.api.model.HostConfig.newHostConfig
 import com.github.dockerjava.api.model.{ ExposedPort, Ports }
 import com.github.dockerjava.core.{ DockerClientConfig, DockerClientImpl }
@@ -74,7 +73,7 @@ class DockerControllerSpec extends AnyFreeSpec with BeforeAndAfter with BeforeAn
 
   val url = new URL(s"http://$host:$hostPort")
 
-  def wget = {
+  def wget: Unit = {
     var connection: HttpURLConnection = null
     var in: InputStream               = null
     try {

diff --git a/.../scala/com/github/j5ik2o/dockerController/dynamodbLocal/DynamoDBLocalControllerSpec.scala b/.../scala/com/github/j5ik2o/dockerController/dynamodbLocal/DynamoDBLocalControllerSpec.scala
@@ -41,7 +41,7 @@ class DynamoDBLocalControllerSpec extends AnyFreeSpec with DockerControllerSpecS
       controller -> waitPredicateSetting
     )
 
-  val dynamoDBEndpoint                = s"http://$dockerHost:$hostPort"
+  val dynamoDBEndpoint: String        = s"http://$dockerHost:$hostPort"
   val dynamoDBRegion: Regions         = Regions.AP_NORTHEAST_1
   val dynamoDBAccessKeyId: String     = "x"
   val dynamoDBSecretAccessKey: String = "x"

diff --git a/...scala-minio/src/main/scala/com/github/j5ik2o/dockerController/minio/MinioController.scala b/...scala-minio/src/main/scala/com/github/j5ik2o/dockerController/minio/MinioController.scala
@@ -8,12 +8,13 @@ import com.github.j5ik2o.dockerController.DockerControllerImpl
 import com.github.j5ik2o.dockerController.minio.MinioController._
 
 import scala.concurrent.duration.{ DurationInt, FiniteDuration }
+import scala.util.matching.Regex
 
 object MinioController {
-  final val DefaultImageName      = "minio/minio"
-  final val DefaultImageTag       = Some("RELEASE.2021-03-17T02-33-02Z")
-  final val DefaultContainerPort  = 9000
-  final val RegexForWaitPredicate = """^Browser Access:.*""".r
+  final val DefaultImageName              = "minio/minio"
+  final val DefaultImageTag: Some[String] = Some("RELEASE.2021-03-17T02-33-02Z")
+  final val DefaultContainerPort          = 9000
+  final val RegexForWaitPredicate: Regex  = """^Browser Access:.*""".r
 
   final val DefaultMinioAccessKeyId: String     = "AKIAIOSFODNN7EXAMPLE"
   final val DefaultMinioSecretAccessKey: String = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"

diff --git a/...per/src/main/scala/com/github/j5ik2o/dockerController/zooKeeper/ZooKeeperController.scala b/...per/src/main/scala/com/github/j5ik2o/dockerController/zooKeeper/ZooKeeperController.scala
@@ -8,12 +8,13 @@ import com.github.j5ik2o.dockerController.zooKeeper.ZooKeeperController._
 import com.github.j5ik2o.dockerController.{ DockerControllerImpl, NetworkAlias }
 
 import scala.concurrent.duration.{ DurationInt, FiniteDuration }
+import scala.util.matching.Regex
 
 object ZooKeeperController {
-  final val DefaultImageName      = "zookeeper"
-  final val DefaultImageTag       = Some("3.4.9")
-  final val DefaultZooPort        = 2181
-  final val RegexForWaitPredicate = """binding to port 0.0.0.0/0.0.0.0:.*""".r
+  final val DefaultImageName              = "zookeeper"
+  final val DefaultImageTag: Some[String] = Some("3.4.9")
+  final val DefaultZooPort                = 2181
+  final val RegexForWaitPredicate: Regex  = """binding to port 0.0.0.0/0.0.0.0:.*""".r
 
   def apply(
       dockerClient: DockerClient,