Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: krasserm/streamz
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.13-RC4
Choose a base ref
...
head repository: krasserm/streamz
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 5 files changed
  • 3 contributors

Commits on Oct 19, 2020

  1. Use <:<Notused instead of =:=NotUsed 

    This is so that calling code that wishes to discard mat values can do
`.mapMaterializedValue(_ => NotUsed)`. Currently it must use
`.mapMaterializedValue(_ => NotUsed: NotUsed)` because the former infers the
type to be `Source[A, NotUsed.type]`
    @Daenyth
    Daenyth committed Oct 19, 2020
    Copy the full SHA
    4b1eded View commit details

Commits on Nov 5, 2020

  1. Use Bintray repository for resolvers in the readme (#86) 

    SBT since 1.4.0 doesn't allow the http resolvers

Co-authored-by: Gavin Bisesi <Daenyth+github@gmail.com>
    @danicheg @Daenyth
    danicheg and Daenyth authored Nov 5, 2020
    Copy the full SHA
    1d47de0 View commit details
Showing with 7 additions and 9 deletions.
  1. +1 −1 README.md
  2. +1 −2 streamz-camel-akka/README.md
  3. +1 −1 streamz-camel-fs2/README.md
  4. +1 −2 streamz-converter/README.md
  5. +3 −3 streamz-converter/src/main/scala/streamz/converter/Converter.scala
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ Dependencies

Streamz artifacts are available for Scala 2.12 and 2.13 at:

resolvers += "streamz at bintray" at "http://dl.bintray.com/streamz/maven"
resolvers += Resolver.bintrayRepo("streamz", "maven")
val streamzVersion = "0.13"

libraryDependencies ++= Seq(
3 changes: 1 addition & 2 deletions streamz-camel-akka/README.md
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Camel DSL for Akka Streams

The DSL is provided by the `streamz-camel-akka` artifact which is available for Scala 2.11 and 2.12:

resolvers += "krasserm at bintray" at "http://dl.bintray.com/krasserm/maven"
resolvers += Resolver.bintrayRepo("krasserm", "maven")

libraryDependencies += "com.github.krasserm" %% "streamz-camel-akka" % "0.10-M2"

@@ -358,4 +358,3 @@ public interface JavaDsl {
```

`sendBody` wraps a message of type `A` as message body into a `StreamMessage[A]` before sending it to the endpoint and continues the stream with the unwrapped message body `B` of the output `StreamMessage[B]`.

2 changes: 1 addition & 1 deletion streamz-camel-fs2/README.md
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Camel DSL for FS2

The DSL is provided by the `streamz-camel-fs2` artifact which is available for Scala 2.11 and 2.12:

resolvers += "krasserm at bintray" at "http://dl.bintray.com/krasserm/maven"
resolvers += Resolver.bintrayRepo("krasserm", "maven")

libraryDependencies += "com.github.krasserm" %% "streamz-camel-fs2" % "0.10-M2"

3 changes: 1 addition & 2 deletions streamz-converter/README.md
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ Stream converters

Stream converters convert Akka Stream `Source`s, `Flow`s and `Sink`s to FS2 `Stream`s, `Pipe`s and `Sink`s, respectively, and vice versa. They are provided by the

resolvers += "krasserm at bintray" at "http://dl.bintray.com/krasserm/maven"
resolvers += Resolver.bintrayRepo("krasserm", "maven")

libraryDependencies += "com.github.krasserm" %% "streamz-converter" % "0.11-RC1"

@@ -116,4 +116,3 @@ assert(Await.result(aSource2.via(aFlow2).toMat(AkkaSink.seq)(Keep.right).run(),
### Backpressure, cancellation, completion and errors

Downstream demand and cancellation as well as upstream completion and error signals are properly mediated between Akka Stream and FS2 (see also [ConverterSpec](https://github.com/krasserm/streamz/blob/master/streamz-converter/src/test/scala/streamz/converter/ConverterSpec.scala)).

6 changes: 3 additions & 3 deletions streamz-converter/src/main/scala/streamz/converter/Converter.scala
View file
Original file line number Diff line number Diff line change
@@ -246,7 +246,7 @@ trait ConverterDsl extends Converter {

/** @see [[Converter#akkaSourceToFs2Stream]] */
def toStream[F[_]: ContextShift: Async](implicit materializer: Materializer, @implicitNotFound(
"Cannot convert `Source[A, M]` to `Stream[F, A]` - `M` value would be discarded.\nIf that is intended, first convert the `Source` to `Source[A, NotUsed]`.\nIf `M` should not be discarded, then use `source.toStreamMat[F]` instead.") ev: M =:= NotUsed): Stream[F, A] = {
"Cannot convert `Source[A, M]` to `Stream[F, A]` - `M` value would be discarded.\nIf that is intended, first convert the `Source` to `Source[A, NotUsed]`.\nIf `M` should not be discarded, then use `source.toStreamMat[F]` instead.") ev: M <:< NotUsed): Stream[F, A] = {
val _ = ev // to suppress 'never used' warning. The warning fires on 2.12 but not on 2.13, so I can't use `nowarn`
akkaSourceToFs2Stream(source.asInstanceOf[Graph[SourceShape[A], NotUsed]])
}
@@ -282,7 +282,7 @@ trait ConverterDsl extends Converter {
def toPipe[F[_]: ContextShift: Concurrent](implicit
materializer: Materializer,
@implicitNotFound(
"Cannot convert `Sink[A, M]` to `Pipe[F, A, Unit]` - `M` value would be discarded.\nIf that is intended, first convert the `Sink` to `Sink[A, NotUsed]`.\nIf `M` should not be discarded, then use `sink.toPipeMat[F]` instead.") ev: M =:= NotUsed): Pipe[F, A, Unit] = {
"Cannot convert `Sink[A, M]` to `Pipe[F, A, Unit]` - `M` value would be discarded.\nIf that is intended, first convert the `Sink` to `Sink[A, NotUsed]`.\nIf `M` should not be discarded, then use `sink.toPipeMat[F]` instead.") ev: M <:< NotUsed): Pipe[F, A, Unit] = {
val _ = ev // to suppress 'never used' warning. The warning fires on 2.12 but not on 2.13, so I can't use `nowarn`
akkaSinkToFs2Pipe(sink.asInstanceOf[Graph[SinkShape[A], NotUsed]])
}
@@ -311,7 +311,7 @@ trait ConverterDsl extends Converter {
implicit
materializer: Materializer,
@implicitNotFound(
"Cannot convert `Flow[A, B, M]` to `Pipe[F, A, B]` - `M` value would be discarded.\nIf that is intended, first convert the `Flow` to `Flow[A, B, NotUsed]`.\nIf `M` should not be discarded, then use `flow.toPipeMat[F]` instead.") ev: M =:= NotUsed): Pipe[F, A, B] = {
"Cannot convert `Flow[A, B, M]` to `Pipe[F, A, B]` - `M` value would be discarded.\nIf that is intended, first convert the `Flow` to `Flow[A, B, NotUsed]`.\nIf `M` should not be discarded, then use `flow.toPipeMat[F]` instead.") ev: M <:< NotUsed): Pipe[F, A, B] = {
val _ = ev // to suppress 'never used' warning. The warning fires on 2.12 but not on 2.13, so I can't use `nowarn`
akkaFlowToFs2Pipe(flow.asInstanceOf[Graph[FlowShape[A, B], NotUsed]])
}