From 330a593e54a5c374b8454e9ab841bc7c06dc6b1a Mon Sep 17 00:00:00 2001 From: prateekatknoldus Date: Wed, 26 Jan 2022 23:07:40 +0530 Subject: [PATCH 1/2] removed type annotations warnings in LoggerWithMarkerSpec --- .../scalalogging/LoggerWithTaggedArgsSpec.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala index 0877682..f6ce51e 100644 --- a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala +++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala @@ -1,6 +1,7 @@ package com.typesafe.scalalogging -import org.slf4j.{ Logger => Underlying } +import com.typesafe.scalalogging.tag.@@ +import org.slf4j.{Logger => Underlying} import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.scalatestplus.mockito.MockitoSugar @@ -106,11 +107,11 @@ class LoggerWithTaggedArgsSpec extends AnyWordSpec with Matchers with Varargs wi private def fixture(p: Underlying => Boolean, isEnabled: Boolean = true) = new LoggerF(p, isEnabled) private class LoggerF(p: Underlying => Boolean, isEnabled: Boolean = true) { - val arg1 = tag.taggedString[Tag]("arg1") - val arg2 = tag.taggedInteger[Tag](Integer.valueOf(1)) - val arg3 = tag.taggedBoolean[Boolean](true) - val underlying = mock[org.slf4j.Logger] + val arg1: String @@ Tag = tag.taggedString[Tag]("arg1") + val arg2: Integer @@ Tag = tag.taggedInteger[Tag](Integer.valueOf(1)) + val arg3: Boolean @@ Boolean = tag.taggedBoolean[Boolean](true) + val underlying: Underlying = mock[org.slf4j.Logger] when(p(underlying)).thenReturn(isEnabled) - val logger = Logger(underlying) + val logger: Logger = Logger(underlying) } } From 1591bf4a2add4ea5a827180e9aeb0ecc97d2a97d Mon Sep 17 00:00:00 2001 From: prateekatknoldus Date: Wed, 26 Jan 2022 23:26:05 +0530 Subject: [PATCH 2/2] minor change --- .../com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala index f6ce51e..4500e47 100644 --- a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala +++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala @@ -1,7 +1,7 @@ package com.typesafe.scalalogging import com.typesafe.scalalogging.tag.@@ -import org.slf4j.{Logger => Underlying} +import org.slf4j.{ Logger => Underlying } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.scalatestplus.mockito.MockitoSugar