Skip to content

Commit 553fc21

Browse files
j5ik2o-bot[bot]j5ik2o-bot[bot]
committed
Reformat with scalafmt 2.7.5
1 parent 3b31abd commit 553fc21

File tree

9 files changed

+131
-126
lines changed

9 files changed

+131
-126
lines changed

‎build.sbt‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@ lazy val baseSettings = Seq(
1212
homepage := Some(url("https://github.com/j5ik2o/docker-controller-scala")),
1313
licenses := List("The MIT License" -> url("http://opensource.org/licenses/MIT")),
1414
developers := List(
15-
Developer(
16-
id = "j5ik2o",
17-
name = "Junichi Kato",
18-
email = "[email protected]",
19-
url = url("https://blog.j5ik2o.me")
20-
)
21-
),
15+
Developer(
16+
id = "j5ik2o",
17+
name = "Junichi Kato",
18+
email = "[email protected]",
19+
url = url("https://blog.j5ik2o.me")
20+
)
21+
),
2222
scalaVersion := Versions.scala212Version,
2323
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version),
2424
scalacOptions ++= (Seq(
25-
"-feature",
26-
"-deprecation",
27-
"-unchecked",
28-
"-encoding",
29-
"UTF-8",
30-
"-language:_",
31-
"-Ydelambdafy:method",
32-
"-target:jvm-1.8",
33-
"-Yrangepos",
34-
"-Ywarn-unused"
35-
) ++ crossScalacOptions(scalaVersion.value)),
25+
"-feature",
26+
"-deprecation",
27+
"-unchecked",
28+
"-encoding",
29+
"UTF-8",
30+
"-language:_",
31+
"-Ydelambdafy:method",
32+
"-target:jvm-1.8",
33+
"-Yrangepos",
34+
"-Ywarn-unused"
35+
) ++ crossScalacOptions(scalaVersion.value)),
3636
resolvers ++= Seq(
37-
Resolver.sonatypeRepo("snapshots"),
38-
Resolver.sonatypeRepo("releases"),
39-
"Seasar Repository" at "https://maven.seasar.org/maven2/"
40-
),
37+
Resolver.sonatypeRepo("snapshots"),
38+
Resolver.sonatypeRepo("releases"),
39+
"Seasar Repository" at "https://maven.seasar.org/maven2/"
40+
),
4141
libraryDependencies ++= Seq(
42-
scalatest.scalatest % Test
43-
),
42+
scalatest.scalatest % Test
43+
),
4444
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
4545
semanticdbEnabled := true,
4646
semanticdbVersion := scalafixSemanticdb.revision,
@@ -63,18 +63,18 @@ val `docker-controller-scala-core` = (project in file("docker-controller-scala-c
6363
.settings(
6464
name := "docker-controller-scala-core",
6565
libraryDependencies ++= Seq(
66-
slf4j.api,
67-
dockerJava.dockerJava,
68-
dockerJava.dockerJavaTransportJersey,
69-
dockerJava.dockerJavaTransportHttpclient5,
70-
dockerJava.dockerJavaTransportOkhttp,
71-
tongfei.progressbar,
72-
seasar.s2util,
73-
freemarker.freemarker,
74-
logback.classic % Test,
75-
commons.io,
76-
beachape.enumeratum
77-
),
66+
slf4j.api,
67+
dockerJava.dockerJava,
68+
dockerJava.dockerJavaTransportJersey,
69+
dockerJava.dockerJavaTransportHttpclient5,
70+
dockerJava.dockerJavaTransportOkhttp,
71+
tongfei.progressbar,
72+
seasar.s2util,
73+
freemarker.freemarker,
74+
logback.classic % Test,
75+
commons.io,
76+
beachape.enumeratum
77+
),
7878
libraryDependencies ++= {
7979
CrossVersion.partialVersion(scalaVersion.value) match {
8080
case Some((2L, scalaMajor)) if scalaMajor == 13 =>
@@ -92,53 +92,53 @@ val `docker-controller-scala-scalatest` = (project in file("docker-controller-sc
9292
.settings(
9393
name := "docker-controller-scala-scalatest",
9494
libraryDependencies ++= Seq(
95-
scalatest.scalatest,
96-
logback.classic
97-
)
95+
scalatest.scalatest,
96+
logback.classic
97+
)
9898
).dependsOn(`docker-controller-scala-core`)
9999

100100
val `docker-controller-scala-dynamodb-local` = (project in file("docker-controller-scala-dynamodb-local"))
101101
.settings(baseSettings)
102102
.settings(
103103
name := "docker-controller-scala-dynamodb-local",
104104
libraryDependencies ++= Seq(
105-
scalatest.scalatest % Test,
106-
logback.classic % Test,
107-
amazonAws.dynamodb % Test
108-
)
105+
scalatest.scalatest % Test,
106+
logback.classic % Test,
107+
amazonAws.dynamodb % Test
108+
)
109109
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
110110

111111
val `docker-controller-scala-minio` = (project in file("docker-controller-scala-minio"))
112112
.settings(baseSettings)
113113
.settings(
114114
name := "docker-controller-scala-minio",
115115
libraryDependencies ++= Seq(
116-
scalatest.scalatest % Test,
117-
logback.classic % Test,
118-
amazonAws.s3 % Test
119-
)
116+
scalatest.scalatest % Test,
117+
logback.classic % Test,
118+
amazonAws.s3 % Test
119+
)
120120
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
121121

122122
val `docker-controller-scala-zookeeper` = (project in file("docker-controller-scala-zookeeper"))
123123
.settings(baseSettings)
124124
.settings(
125125
name := "docker-controller-scala-zookeeper",
126126
libraryDependencies ++= Seq(
127-
scalatest.scalatest % Test,
128-
logback.classic % Test,
129-
apache.zooKeeper.zooKeeper % Test
130-
)
127+
scalatest.scalatest % Test,
128+
logback.classic % Test,
129+
apache.zooKeeper.zooKeeper % Test
130+
)
131131
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
132132

133133
val `docker-controller-scala-kafka` = (project in file("docker-controller-scala-kafka"))
134134
.settings(baseSettings)
135135
.settings(
136136
name := "docker-controller-scala-kafka",
137137
libraryDependencies ++= Seq(
138-
scalatest.scalatest % Test,
139-
logback.classic % Test,
140-
apache.kafka.kafkaClients % Test
141-
)
138+
scalatest.scalatest % Test,
139+
logback.classic % Test,
140+
apache.kafka.kafkaClients % Test
141+
)
142142
).dependsOn(
143143
`docker-controller-scala-core`,
144144
`docker-controller-scala-zookeeper`,
@@ -150,33 +150,33 @@ val `docker-controller-scala-mysql` = (project in file("docker-controller-scala-
150150
.settings(
151151
name := "docker-controller-scala-mysql",
152152
libraryDependencies ++= Seq(
153-
scalatest.scalatest % Test,
154-
logback.classic % Test,
155-
mysql.connectorJava % Test
156-
)
153+
scalatest.scalatest % Test,
154+
logback.classic % Test,
155+
mysql.connectorJava % Test
156+
)
157157
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
158158

159159
val `docker-controller-scala-elasticsearch` = (project in file("docker-controller-scala-elasticsearch"))
160160
.settings(baseSettings)
161161
.settings(
162162
name := "docker-controller-scala-elasticsearch",
163163
libraryDependencies ++= Seq(
164-
scalatest.scalatest % Test,
165-
logback.classic % Test,
166-
elasticsearch.restHighLevelClient % Test
167-
)
164+
scalatest.scalatest % Test,
165+
logback.classic % Test,
166+
elasticsearch.restHighLevelClient % Test
167+
)
168168
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
169169

170170
val `docker-controller-scala-localstack` = (project in file("docker-controller-scala-localstack"))
171171
.settings(baseSettings)
172172
.settings(
173173
name := "docker-controller-scala-localstack",
174174
libraryDependencies ++= Seq(
175-
scalatest.scalatest % Test,
176-
logback.classic % Test,
177-
amazonAws.s3 % Test,
178-
amazonAws.dynamodb % Test
179-
)
175+
scalatest.scalatest % Test,
176+
logback.classic % Test,
177+
amazonAws.s3 % Test,
178+
amazonAws.dynamodb % Test
179+
)
180180
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
181181

182182
val `docker-controller-scala-root` = (project in file("."))

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

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ private[dockerController] class DockerControllerImpl(
214214
})
215215
.awaitCompletion()
216216
} finally {
217-
progressBarMap.foreach {
218-
case (_, progressBar) => progressBar.close()
217+
progressBarMap.foreach { case (_, progressBar) =>
218+
progressBar.close()
219219
}
220220
}
221221
logger.debug("pullContainer --- finish")
@@ -264,13 +264,15 @@ private[dockerController] class DockerControllerImpl(
264264
override def run(): Unit = {
265265
@tailrec
266266
def loop(): Unit = {
267-
if (!terminate && {
268-
val frame = frameQueue.poll(outputFrameInterval.toMillis, TimeUnit.MILLISECONDS)
269-
if (frame != null) {
270-
logger.debug(frame.toString)
271-
!predicate(frame)
272-
} else true
273-
}) {
267+
if (
268+
!terminate && {
269+
val frame = frameQueue.poll(outputFrameInterval.toMillis, TimeUnit.MILLISECONDS)
270+
if (frame != null) {
271+
logger.debug(frame.toString)
272+
!predicate(frame)
273+
} else true
274+
}
275+
) {
274276
loop()
275277
}
276278
}
@@ -290,12 +292,15 @@ private[dockerController] class DockerControllerImpl(
290292
thread.start()
291293
if (duration.isFinite) {
292294
val timer = new Timer()
293-
timer.schedule(new TimerTask {
294-
override def run(): Unit = {
295-
terminate = true
296-
thread.interrupt()
297-
}
298-
}, duration.toMillis)
295+
timer.schedule(
296+
new TimerTask {
297+
override def run(): Unit = {
298+
terminate = true
299+
thread.interrupt()
300+
}
301+
},
302+
duration.toMillis
303+
)
299304
timer.cancel()
300305
}
301306
thread.join()

‎docker-controller-scala-elasticsearch/src/main/scala/com/github/j5ik2o/dockerController/elasticsearch/ElasticsearchController.scala‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,14 @@ class ElasticsearchController(
3939
) extends DockerControllerImpl(dockerClient, outputFrameInterval)(imageName, imageTag) {
4040

4141
private val environmentVariables = Map(
42-
"discovery.type" -> "single-node"
43-
) ++ envVars
42+
"discovery.type" -> "single-node"
43+
) ++ envVars
4444

4545
override protected def newCreateContainerCmd(): CreateContainerCmd = {
4646
val containerPorts = DefaultContainerPorts.map(ExposedPort.tcp)
4747
val portBinding = new Ports()
48-
containerPorts.zip(Seq(hostPort1, hostPort2)).foreach {
49-
case (containerPort, hostPort) =>
50-
portBinding.bind(containerPort, Ports.Binding.bindPort(hostPort))
48+
containerPorts.zip(Seq(hostPort1, hostPort2)).foreach { case (containerPort, hostPort) =>
49+
portBinding.bind(containerPort, Ports.Binding.bindPort(hostPort))
5150
}
5251
val result = super
5352
.newCreateContainerCmd()

‎docker-controller-scala-kafka/src/main/scala/com/github/j5ik2o/dockerController/kafka/KafkaController.scala‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ class KafkaController(
7070
private val zooKeeperContainerPort = zooKeeperController.containerPort
7171

7272
private val environmentVariables = Map(
73-
"KAFKA_AUTO_CREATE_TOPICS_ENABLE" -> (if (createTopics.isEmpty) "false" else "true"),
74-
"KAFKA_CREATE_TOPICS" -> createTopics.mkString(","),
75-
"KAFKA_BROKER_ID" -> "1",
76-
"KAFKA_ADVERTISED_LISTENERS" -> s"LISTENER_DOCKER_INTERNAL://$kafkaContainerName:19092,LISTENER_DOCKER_EXTERNAL://$kafkaExternalHostName:$kafkaExternalHostPort",
77-
"KAFKA_LISTENERS" -> s"LISTENER_DOCKER_INTERNAL://:19092,LISTENER_DOCKER_EXTERNAL://:$kafkaExternalHostPort",
78-
"KAFKA_LISTENER_SECURITY_PROTOCOL_MAP" -> "LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT",
79-
"KAFKA_INTER_BROKER_LISTENER_NAME" -> "LISTENER_DOCKER_INTERNAL",
80-
"KAFKA_ZOOKEEPER_CONNECT" -> s"$zooKeeperContainerName:$zooKeeperContainerPort",
81-
"KAFKA_LOG4J_LOGGERS" -> "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO",
82-
"KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR" -> "1"
83-
) ++ envVars
73+
"KAFKA_AUTO_CREATE_TOPICS_ENABLE" -> (if (createTopics.isEmpty) "false" else "true"),
74+
"KAFKA_CREATE_TOPICS" -> createTopics.mkString(","),
75+
"KAFKA_BROKER_ID" -> "1",
76+
"KAFKA_ADVERTISED_LISTENERS" -> s"LISTENER_DOCKER_INTERNAL://$kafkaContainerName:19092,LISTENER_DOCKER_EXTERNAL://$kafkaExternalHostName:$kafkaExternalHostPort",
77+
"KAFKA_LISTENERS" -> s"LISTENER_DOCKER_INTERNAL://:19092,LISTENER_DOCKER_EXTERNAL://:$kafkaExternalHostPort",
78+
"KAFKA_LISTENER_SECURITY_PROTOCOL_MAP" -> "LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT",
79+
"KAFKA_INTER_BROKER_LISTENER_NAME" -> "LISTENER_DOCKER_INTERNAL",
80+
"KAFKA_ZOOKEEPER_CONNECT" -> s"$zooKeeperContainerName:$zooKeeperContainerPort",
81+
"KAFKA_LOG4J_LOGGERS" -> "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO",
82+
"KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR" -> "1"
83+
) ++ envVars
8484

8585
override def createContainer(f: CreateContainerCmd => CreateContainerCmd): CreateContainerResponse = {
8686
zooKeeperController.pullImageIfNotExists()

‎docker-controller-scala-localstack/src/main/scala/com/github/j5ik2o/dockerController/localstack/LocalStackController.scala‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,26 +79,24 @@ class LocalStackController(
7979
) extends DockerControllerImpl(dockerClient, outputFrameInterval)(imageName, imageTag) {
8080

8181
private val environmentVariables: Map[String, String] = Map(
82-
"SERVICES" -> services.map(_.entryName).mkString(",")
83-
) ++
84-
hostName.fold(Map.empty[String, String]) { h => Map("HOSTNAME" -> h) } ++
82+
"SERVICES" -> services.map(_.entryName).mkString(",")
83+
) ++
84+
hostName.fold(Map.empty[String, String]) { h => Map("HOSTNAME" -> h) } ++
8585
hostNameExternal.fold(Map.empty[String, String]) { h => Map("HOSTNAME_EXTERNAL" -> h) } ++
86-
defaultRegion.fold(Map.empty[String, String]) { r => Map("DEFAULT_REGION" -> r) } ++
87-
hostPorts.foldLeft(Map.empty[String, String]) {
88-
case (result, (s, p)) => result ++ Map(s.entryName.toUpperCase + "_PORT_EXTERNAL" -> p.toString)
86+
defaultRegion.fold(Map.empty[String, String]) { r => Map("DEFAULT_REGION" -> r) } ++
87+
hostPorts.foldLeft(Map.empty[String, String]) { case (result, (s, p)) =>
88+
result ++ Map(s.entryName.toUpperCase + "_PORT_EXTERNAL" -> p.toString)
8989
} ++ envVars
9090

9191
logger.debug(s"environmentVariables= $environmentVariables")
9292

9393
override protected def newCreateContainerCmd(): CreateContainerCmd = {
9494
val portBinding = new Ports()
95-
val containerPortWithHostPorts = hostPorts.map {
96-
case (service, port) =>
97-
(ExposedPort.tcp(service.port), port)
95+
val containerPortWithHostPorts = hostPorts.map { case (service, port) =>
96+
(ExposedPort.tcp(service.port), port)
9897
}
99-
containerPortWithHostPorts.foreach {
100-
case (servicePort, hostPort) =>
101-
portBinding.bind(servicePort, Ports.Binding.bindPort(hostPort))
98+
containerPortWithHostPorts.foreach { case (servicePort, hostPort) =>
99+
portBinding.bind(servicePort, Ports.Binding.bindPort(hostPort))
102100
}
103101
super
104102
.newCreateContainerCmd()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class MinioController(
5050
) extends DockerControllerImpl(dockerClient, outputFrameInterval)(imageName, imageTag) {
5151

5252
private val environmentVariables = Map(
53-
"MINIO_ROOT_USER" -> minioAccessKeyId,
54-
"MINIO_ROOT_PASSWORD" -> minioSecretAccessKey
55-
) ++ envVars
53+
"MINIO_ROOT_USER" -> minioAccessKeyId,
54+
"MINIO_ROOT_PASSWORD" -> minioSecretAccessKey
55+
) ++ envVars
5656

5757
override protected def newCreateContainerCmd(): CreateContainerCmd = {
5858
val containerPort = ExposedPort.tcp(DefaultContainerPort)

‎docker-controller-scala-mysql/src/main/scala/com/github/j5ik2o/dockerController/mysql/MySQLController.scala‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ class MySQLController(
4949

5050
private val environmentVariables: Map[String, String] = {
5151
val env1 = Map[String, String](
52-
"MYSQL_ROOT_PASSWORD" -> rootPassword
53-
) ++ envVars
54-
val env2 = userNameAndPassword.fold(env1) {
55-
case MySQLUserNameAndPassword(u, p) =>
56-
env1 ++ Map("MYSQL_USER" -> u, "MYSQL_PASSWORD" -> p)
52+
"MYSQL_ROOT_PASSWORD" -> rootPassword
53+
) ++ envVars
54+
val env2 = userNameAndPassword.fold(env1) { case MySQLUserNameAndPassword(u, p) =>
55+
env1 ++ Map("MYSQL_USER" -> u, "MYSQL_PASSWORD" -> p)
5756
}
5857
databaseName.fold(env2) { name => env2 ++ Map("MYSQL_DATABASE" -> name) }
5958
}

‎docker-controller-scala-scalatest/src/main/scala/com/github/j5ik2o/dockerController/DockerControllerSpecSupport.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ trait DockerControllerSpecSupport extends DockerControllerSuiteBase { this: Test
5959
}
6060

6161
protected def beforeCreateContainers(): Unit = {}
62-
protected def afterRemoveContainers(): Unit = {}
62+
protected def afterRemoveContainers(): Unit = {}
6363

6464
abstract override def run(testName: Option[String], args: Args): Status = {
6565
(createRemoveLifecycle, startStopLifecycle) match {

0 commit comments

Comments
 (0)