Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add ZStream#ensuringFirst #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2019
Merged

Add ZStream#ensuringFirst #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f9871e
add ZStream.ensuringFirst
adamgfraser Jul 21, 2019
dbc3f28
merge upstream changes
adamgfraser Jul 21, 2019
349571d
resolve merge conflict
adamgfraser Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions streams/jvm/src/test/scala/zio/stream/StreamSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ class ZStreamSpec(implicit ee: org.specs2.concurrent.ExecutionEnv)

Stream.ensuring $ensuring

Stream.ensuringFirst $ensuringFirst

Stream.finalizer $finalizer

Stream.filter
Expand Down Expand Up @@ -561,6 +563,18 @@ class ZStreamSpec(implicit ee: org.specs2.concurrent.ExecutionEnv)
} yield execution must_=== List("Ensuring", "Release", "Use", "Acquire")
}

private def ensuringFirst =
unsafeRun {
for {
log <- Ref.make[List[String]](Nil)
_ <- (for {
_ <- Stream.bracket(log.update("Acquire" :: _))(_ => log.update("Release" :: _))
_ <- Stream.fromEffect(log.update("Use" :: _))
} yield ()).ensuringFirst(log.update("Ensuring" :: _)).runDrain
execution <- log.get
} yield execution must_=== List("Release", "Ensuring", "Use", "Acquire")
}

private def finalizer =
unsafeRun {
for {
Expand Down
13 changes: 13 additions & 0 deletions streams/shared/src/main/scala/zio/stream/ZStream.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,19 @@ trait ZStream[-R, +E, +A] extends Serializable { self =>
}
}

/**
* Executes the provided finalizer before this stream's finalizers run.
*/
def ensuringFirst[R1 <: R](fin: ZIO[R1, Nothing, _]): ZStream[R1, E, A] =
new ZStream[R1, E, A] {
def fold[R2 <: R1, E1 >: E, A1 >: A, S]: ZStream.Fold[R2, E1, A1, S] =
ZManaged.succeedLazy { (s, cont, f) =>
self.fold[R2, E1, A1, S].flatMap { fold =>
fold(s, cont, f).ensuringFirst(fin)
}
}
}

/**
* Filters this stream by the specified predicate, retaining all elements for
* which the predicate evaluates to true.
Expand Down