From f75679c27c88c8398370dfc145c451aec7c7b8c8 Mon Sep 17 00:00:00 2001 From: arempter Date: Wed, 13 Mar 2019 08:14:22 +0100 Subject: [PATCH 1/4] fix formatting --- build.sbt | 2 +- .../ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index f22913e9..857ae0eb 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import com.typesafe.sbt.packager.docker.ExecCmd import scalariform.formatter.preferences._ name := "airlock" -version := "0.1.13" +version := "0.1.14" scalaVersion := "2.12.8" diff --git a/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala b/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala index 06304ef7..d9df669b 100644 --- a/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala +++ b/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala @@ -30,7 +30,7 @@ trait EventProducer extends LazyLogging { ProducerConfig.MAX_BLOCK_MS_CONFIG -> kafkaSettings.maxblock ) - def kafkaProducer: KafkaProducer[String, String] = new KafkaProducer(config.asJava, new StringSerializer, new StringSerializer) + private val kafkaProducer: KafkaProducer[String, String] = new KafkaProducer(config.asJava, new StringSerializer, new StringSerializer) def sendSingleMessage(event: String, topic: String): Future[Done] = { kafkaProducer From cd8435ac021a459a1964718da35ba3cc56fefe0a Mon Sep 17 00:00:00 2001 From: arempter Date: Wed, 13 Mar 2019 08:33:44 +0100 Subject: [PATCH 2/4] version bump --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 857ae0eb..6871cd9d 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import com.typesafe.sbt.packager.docker.ExecCmd import scalariform.formatter.preferences._ name := "airlock" -version := "0.1.14" +version := "0.1.16" scalaVersion := "2.12.8" From 13efed6a7f4dcd3e5cbf46ee74bff86479b7d0cb Mon Sep 17 00:00:00 2001 From: arempter Date: Wed, 13 Mar 2019 08:55:54 +0100 Subject: [PATCH 3/4] add lazy init for producer --- .../ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala b/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala index d9df669b..34f777f3 100644 --- a/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala +++ b/src/main/scala/com/ing/wbaa/airlock/proxy/provider/kafka/EventProducer.scala @@ -30,7 +30,7 @@ trait EventProducer extends LazyLogging { ProducerConfig.MAX_BLOCK_MS_CONFIG -> kafkaSettings.maxblock ) - private val kafkaProducer: KafkaProducer[String, String] = new KafkaProducer(config.asJava, new StringSerializer, new StringSerializer) + private lazy val kafkaProducer: KafkaProducer[String, String] = new KafkaProducer(config.asJava, new StringSerializer, new StringSerializer) def sendSingleMessage(event: String, topic: String): Future[Done] = { kafkaProducer From 9be330c4a0a293b9ac5db02316604cbb75e4d46c Mon Sep 17 00:00:00 2001 From: arempter Date: Wed, 13 Mar 2019 10:49:24 +0100 Subject: [PATCH 4/4] wait for lazy val in test --- .../airlock/proxy/provider/MessageProviderKafkaItTest.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/it/scala/com/ing/wbaa/airlock/proxy/provider/MessageProviderKafkaItTest.scala b/src/it/scala/com/ing/wbaa/airlock/proxy/provider/MessageProviderKafkaItTest.scala index 1a5bf11a..7d9f5c4d 100644 --- a/src/it/scala/com/ing/wbaa/airlock/proxy/provider/MessageProviderKafkaItTest.scala +++ b/src/it/scala/com/ing/wbaa/airlock/proxy/provider/MessageProviderKafkaItTest.scala @@ -33,7 +33,7 @@ class MessageProviderKafkaItTest extends WordSpecLike with DiagrammedAssertions withRunningKafka { val createEventsTopic = "create_events" createCustomTopic(createEventsTopic) - + Thread.sleep(3000) emitEvent(s3Request, HttpMethods.PUT, "testUser") val result = consumeFirstStringMessageFrom(createEventsTopic) assert(result.contains("s3:ObjectCreated:PUT")) @@ -46,7 +46,7 @@ class MessageProviderKafkaItTest extends WordSpecLike with DiagrammedAssertions withRunningKafka { val deleteEventsTopic = "delete_events" createCustomTopic(deleteEventsTopic) - + Thread.sleep(3000) emitEvent(s3Request, HttpMethods.DELETE, "testUser") assert(consumeFirstStringMessageFrom(deleteEventsTopic).contains("s3:ObjectRemoved:DELETE")) }