Skip to content

Commit c457258

Browse files
committed
address PR comments
1 parent 293006d commit c457258

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

build.sbt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,15 @@ lazy val lambda = crossProject(JSPlatform, JVMPlatform)
101101
"io.circe" %%% "circe-literal" % circeVersion % Test
102102
),
103103
mimaBinaryIssueFilters ++= Seq(
104-
ProblemFilters.exclude[IncompatibleMethTypeProblem]("feral.lambda.ClientContext#Impl.*"),
105-
ProblemFilters.exclude[IncompatibleResultTypeProblem]("feral.lambda.ClientContext#Impl.*")
104+
ProblemFilters.exclude[ReversedMissingMethodProblem](
105+
"feral.lambda.ClientContext.clientOption"
106+
), // ClientContext is sealed
107+
ProblemFilters.exclude[IncompatibleMethTypeProblem](
108+
"feral.lambda.ClientContext#Impl.*"
109+
), // ClientContext#Impl is private
110+
ProblemFilters.exclude[IncompatibleResultTypeProblem](
111+
"feral.lambda.ClientContext#Impl.*"
112+
) // ClientContext#Impl is private
106113
)
107114
)
108115
.settings(commonSettings)

lambda/js/src/test/scala/feral/lambda/ContextPlatformSuite.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ import scala.scalajs.js.JSConverters._
3232

3333
class ContextPlatformSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
3434

35-
override def scalaCheckInitialSeed = "Knv3rf_mveQ7dlnyIzRvKi0xdjT6D--8sOcl_v2-1uH="
36-
3735
private val genCognitoIdentity: Gen[facade.CognitoIdentity] =
3836
for {
3937
identityId <- Gen.alphaNumStr
@@ -191,9 +189,9 @@ class ContextPlatformSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
191189
private implicit val compareClientContext: Compare[ClientContext, facade.ClientContext] =
192190
new Compare[ClientContext, facade.ClientContext] {
193191
override def isEqual(obtained: ClientContext, expected: facade.ClientContext): Boolean =
194-
(obtained.maybeClient, expected.client.toOption)
192+
(obtained.clientOption, expected.client.toOption)
195193
.mapN(implicitly[Compare[ClientContextClient, facade.ClientContextClient]].isEqual)
196-
.getOrElse(obtained.maybeClient.isEmpty && expected.client.isEmpty) &&
194+
.getOrElse(obtained.clientOption.isEmpty && expected.client.isEmpty) &&
197195
implicitly[Compare[ClientContextEnv, facade.ClientContextEnv]]
198196
.isEqual(obtained.env, expected.env) &&
199197
implicitly[Compare[JsonObject, js.UndefOr[js.Any]]]

lambda/jvm/src/test/scala/feral/lambda/ContextPlatformSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ class ContextPlatformSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
214214
private implicit val compareClientContext: Compare[ClientContext, runtime.ClientContext] =
215215
new Compare[ClientContext, runtime.ClientContext] {
216216
override def isEqual(obtained: ClientContext, expected: runtime.ClientContext): Boolean =
217-
(obtained.maybeClient, Option(expected.getClient))
217+
(obtained.clientOption, Option(expected.getClient))
218218
.mapN(implicitly[Compare[ClientContextClient, runtime.Client]].isEqual)
219-
.getOrElse(obtained.maybeClient.isEmpty && expected.getClient == null) &&
219+
.getOrElse(obtained.clientOption.isEmpty && expected.getClient == null) &&
220220
implicitly[Compare[ClientContextEnv, util.Map[String, String]]]
221221
.isEqual(obtained.env, expected.getEnvironment) &&
222222
implicitly[Compare[JsonObject, util.Map[String, String]]]

lambda/shared/src/main/scala/feral/lambda/Context.scala

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package feral.lambda
1919
import cats.Applicative
2020
import cats.~>
2121
import io.circe.JsonObject
22-
import org.typelevel.scalaccompat.annotation.nowarn
2322

2423
import scala.concurrent.duration.FiniteDuration
2524

@@ -113,11 +112,11 @@ object CognitoIdentity {
113112

114113
sealed abstract class ClientContext {
115114
@deprecated(
116-
"Use maybeClient, because it's possible this will be populated with empty strings if no client context was received",
115+
"Use clientOption, because this will be populated with empty strings if no client context was received",
117116
"0.3.2")
118-
def client: ClientContextClient
119-
@nowarn("cat=deprecation")
120-
def maybeClient: Option[ClientContextClient] = Option(client)
117+
def client: ClientContextClient =
118+
clientOption.getOrElse(ClientContextClient("", "", "", "", ""))
119+
def clientOption: Option[ClientContextClient]
121120
def env: ClientContextEnv
122121
def custom: JsonObject
123122
}
@@ -144,13 +143,10 @@ object ClientContext {
144143
Impl(client, env, custom)
145144

146145
private final case class Impl(
147-
override val maybeClient: Option[ClientContextClient],
146+
override val clientOption: Option[ClientContextClient],
148147
env: ClientContextEnv,
149148
custom: JsonObject
150149
) extends ClientContext {
151-
override def client: ClientContextClient =
152-
maybeClient.getOrElse(ClientContextClient("", "", "", "", ""))
153-
154150
override def productPrefix = "ClientContext"
155151
}
156152
}

0 commit comments

Comments
 (0)