Skip to content

Commit ea90103

Browse files
committed
style: Reformat
1 parent 5cbda49 commit ea90103

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

docker-controller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerMachineEnv.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ case class DockerMachineEnv(tlsVerify: Boolean, dockerHost: String, dockerCertPa
1212
}
1313

1414
object DockerMachineEnv {
15-
private val logger = LoggerFactory.getLogger(getClass)
15+
LoggerFactory.getLogger(getClass)
1616

1717
private val tlsVerifyRegex: Regex = """export DOCKER_TLS_VERIFY="(.*)"""".r
1818

docker-controller-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeControllerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class DockerComposeControllerSpec extends AnyFreeSpec with BeforeAndAfter with B
3131

3232
val url = new URL(s"http://$host:$hostPort")
3333

34-
def wget = {
34+
def wget: Unit = {
3535
var connection: HttpURLConnection = null
3636
var in: InputStream = null
3737
try {

docker-controller-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerControllerSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.j5ik2o.dockerController
22

33
import com.github.dockerjava.api.DockerClient
4-
import com.github.dockerjava.api.command.CreateContainerCmd
54
import com.github.dockerjava.api.model.HostConfig.newHostConfig
65
import com.github.dockerjava.api.model.{ ExposedPort, Ports }
76
import com.github.dockerjava.core.{ DockerClientConfig, DockerClientImpl }
@@ -74,7 +73,7 @@ class DockerControllerSpec extends AnyFreeSpec with BeforeAndAfter with BeforeAn
7473

7574
val url = new URL(s"http://$host:$hostPort")
7675

77-
def wget = {
76+
def wget: Unit = {
7877
var connection: HttpURLConnection = null
7978
var in: InputStream = null
8079
try {

docker-controller-scala-dynamodb-local/src/test/scala/com/github/j5ik2o/dockerController/dynamodbLocal/DynamoDBLocalControllerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class DynamoDBLocalControllerSpec extends AnyFreeSpec with DockerControllerSpecS
4141
controller -> waitPredicateSetting
4242
)
4343

44-
val dynamoDBEndpoint = s"http://$dockerHost:$hostPort"
44+
val dynamoDBEndpoint: String = s"http://$dockerHost:$hostPort"
4545
val dynamoDBRegion: Regions = Regions.AP_NORTHEAST_1
4646
val dynamoDBAccessKeyId: String = "x"
4747
val dynamoDBSecretAccessKey: String = "x"

docker-controller-scala-minio/src/main/scala/com/github/j5ik2o/dockerController/minio/MinioController.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import com.github.j5ik2o.dockerController.DockerControllerImpl
88
import com.github.j5ik2o.dockerController.minio.MinioController._
99

1010
import scala.concurrent.duration.{ DurationInt, FiniteDuration }
11+
import scala.util.matching.Regex
1112

1213
object MinioController {
13-
final val DefaultImageName = "minio/minio"
14-
final val DefaultImageTag = Some("RELEASE.2021-03-17T02-33-02Z")
15-
final val DefaultContainerPort = 9000
16-
final val RegexForWaitPredicate = """^Browser Access:.*""".r
14+
final val DefaultImageName = "minio/minio"
15+
final val DefaultImageTag: Some[String] = Some("RELEASE.2021-03-17T02-33-02Z")
16+
final val DefaultContainerPort = 9000
17+
final val RegexForWaitPredicate: Regex = """^Browser Access:.*""".r
1718

1819
final val DefaultMinioAccessKeyId: String = "AKIAIOSFODNN7EXAMPLE"
1920
final val DefaultMinioSecretAccessKey: String = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"

docker-controller-scala-zookeeper/src/main/scala/com/github/j5ik2o/dockerController/zooKeeper/ZooKeeperController.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import com.github.j5ik2o.dockerController.zooKeeper.ZooKeeperController._
88
import com.github.j5ik2o.dockerController.{ DockerControllerImpl, NetworkAlias }
99

1010
import scala.concurrent.duration.{ DurationInt, FiniteDuration }
11+
import scala.util.matching.Regex
1112

1213
object ZooKeeperController {
13-
final val DefaultImageName = "zookeeper"
14-
final val DefaultImageTag = Some("3.4.9")
15-
final val DefaultZooPort = 2181
16-
final val RegexForWaitPredicate = """binding to port 0.0.0.0/0.0.0.0:.*""".r
14+
final val DefaultImageName = "zookeeper"
15+
final val DefaultImageTag: Some[String] = Some("3.4.9")
16+
final val DefaultZooPort = 2181
17+
final val RegexForWaitPredicate: Regex = """binding to port 0.0.0.0/0.0.0.0:.*""".r
1718

1819
def apply(
1920
dockerClient: DockerClient,

0 commit comments

Comments
 (0)