Skip to content

Commit 7878037

Browse files
committed
fix: reformat
1 parent 322255b commit 7878037

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ val `docker-controller-scala-elasticsearch` = (project in file("docker-controlle
237237
scalatest.scalatest % Test,
238238
logback.classic % Test,
239239
elasticsearch.restHighLevelClient % Test,
240-
"co.elastic.clients" % "elasticsearch-java" % "7.17.13" % Test,
241-
"com.fasterxml.jackson.core"%"jackson-databind" % "2.12.3" % Test,
242-
"org.apache.logging.log4j" % "log4j-api" % "2.20.0" % Test,
243-
"org.apache.logging.log4j" % "log4j-core" % "2.20.0" % Test
240+
"co.elastic.clients" % "elasticsearch-java" % "7.17.13" % Test,
241+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.12.3" % Test,
242+
"org.apache.logging.log4j" % "log4j-api" % "2.20.0" % Test,
243+
"org.apache.logging.log4j" % "log4j-core" % "2.20.0" % Test
244244
)
245245
).dependsOn(`docker-controller-scala-core`, `docker-controller-scala-scalatest` % Test)
246246

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ class ElasticsearchController(
4848
) extends DockerControllerImpl(dockerClient, isDockerClientAutoClose, outputFrameInterval)(imageName, imageTag) {
4949

5050
private val environmentVariables = Map(
51-
"discovery.type" -> "single-node",
51+
"discovery.type" -> "single-node",
5252
"xpack.security.enabled" -> "false"
53-
// "network.host" -> "0.0.0.0"
5453
) ++ envVars
5554

5655
override protected def newCreateContainerCmd(): CreateContainerCmd = {

docker-controller-scala-elasticsearch/src/test/scala/com/github/j5ik2o/dockerController/elasticsearch/ElasticsearchControllerSpec.scala

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ package com.github.j5ik2o.dockerController.elasticsearch
33
import co.elastic.clients.elasticsearch.ElasticsearchClient
44
import co.elastic.clients.json.jackson.JacksonJsonpMapper
55
import co.elastic.clients.transport.rest_client.RestClientTransport
6-
import com.github.j5ik2o.dockerController.{DockerController, DockerControllerSpecSupport, WaitPredicates}
7-
import org.elasticsearch.client.{RequestOptions, RestClient, RestClientBuilder, RestHighLevelClient, RestHighLevelClientBuilder}
6+
import com.github.j5ik2o.dockerController.{ DockerController, DockerControllerSpecSupport, WaitPredicates }
7+
import org.elasticsearch.client.{
8+
RequestOptions,
9+
RestClient,
10+
RestClientBuilder,
11+
RestHighLevelClient,
12+
RestHighLevelClientBuilder
13+
}
814
import org.scalatest.freespec.AnyFreeSpec
915
import org.apache.http.HttpHost
1016
import org.apache.http.client.methods.RequestBuilder.options
1117
import org.elasticsearch.client.core.MainRequest
1218

13-
import scala.concurrent.duration.{Duration, DurationInt}
19+
import scala.concurrent.duration.{ Duration, DurationInt }
1420
import scala.util.control.NonFatal
1521

1622
class ElasticsearchControllerSpec extends AnyFreeSpec with DockerControllerSpecSupport {
@@ -38,19 +44,20 @@ class ElasticsearchControllerSpec extends AnyFreeSpec with DockerControllerSpecS
3844

3945
"ElasticsearchController" - {
4046
"run" in {
41-
var httpClient: RestClient = null
47+
var httpClient: RestClient = null
4248
var transport: RestClientTransport = null
4349
try {
44-
httpClient = RestClient.builder(
45-
new HttpHost("localhost", hostPort1)
46-
).build()
50+
httpClient = RestClient
51+
.builder(
52+
new HttpHost("localhost", hostPort1)
53+
).build()
4754
transport = new RestClientTransport(
4855
httpClient,
4956
new JacksonJsonpMapper()
5057
)
5158
val esClient = new ElasticsearchClient(transport)
5259
esClient.ping()
53-
} finally {
60+
} finally {
5461
if (transport != null)
5562
transport.close()
5663
if (httpClient != null)

0 commit comments

Comments
 (0)