From c8f462d6e6c70ca175619e7f36f72a933a8fdcb1 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Fri, 28 Mar 2014 14:33:33 +0100 Subject: [PATCH] !str rename SPI/TCK to org.reactivestreams --- akka-stream/src/main/scala/akka/stream/Stream.scala | 2 +- .../main/scala/akka/stream/impl/AbstractProducer.scala | 4 ++-- .../src/main/scala/akka/stream/impl/StreamImpl.scala | 4 ++-- .../src/main/scala/akka/stream/impl/StrictProducer.scala | 4 ++-- .../test/scala/akka/stream/IdentityProcessorTest.scala | 6 +++--- .../src/test/scala/akka/stream/IteratorProducerTest.scala | 4 ++-- akka-stream/src/test/scala/akka/stream/StreamSpec.scala | 2 +- .../test/scala/akka/stream/testkit/ConsumerProbe.scala | 4 ++-- .../test/scala/akka/stream/testkit/ProducerProbe.scala | 6 +++--- .../test/scala/akka/stream/testkit/StreamTestKit.scala | 4 ++-- .../src/test/scala/akka/stream/testkit/TestProducer.scala | 8 ++++---- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/Stream.scala b/akka-stream/src/main/scala/akka/stream/Stream.scala index 3c9b787864..2dd2744425 100644 --- a/akka-stream/src/main/scala/akka/stream/Stream.scala +++ b/akka-stream/src/main/scala/akka/stream/Stream.scala @@ -4,7 +4,7 @@ package akka.stream import scala.collection.immutable -import asyncrx.api.{ Consumer, Producer } +import org.reactivestreams.api.{ Consumer, Producer } import scala.util.control.NonFatal import akka.stream.impl._ import akka.actor.ActorRefFactory diff --git a/akka-stream/src/main/scala/akka/stream/impl/AbstractProducer.scala b/akka-stream/src/main/scala/akka/stream/impl/AbstractProducer.scala index 02299404c5..9fca4c0a4f 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/AbstractProducer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/AbstractProducer.scala @@ -4,8 +4,8 @@ package akka.stream.impl import scala.annotation.tailrec -import asyncrx.api -import asyncrx.spi +import org.reactivestreams.api +import org.reactivestreams.spi import SubscriberManagement.ShutDown import ResizableMultiReaderRingBuffer.NothingToReadException diff --git a/akka-stream/src/main/scala/akka/stream/impl/StreamImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/StreamImpl.scala index fb79ab1846..ad9a7afa59 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/StreamImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/StreamImpl.scala @@ -3,9 +3,9 @@ */ package akka.stream.impl -import asyncrx.api.{ Producer, Consumer, Processor } +import org.reactivestreams.api.{ Producer, Consumer, Processor } import akka.actor.{ Actor, ActorRef, ActorRefFactory, Props, PoisonPill } -import asyncrx.spi.{ Publisher, Subscription, Subscriber } +import org.reactivestreams.spi.{ Publisher, Subscription, Subscriber } import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec import scala.util.control.NonFatal diff --git a/akka-stream/src/main/scala/akka/stream/impl/StrictProducer.scala b/akka-stream/src/main/scala/akka/stream/impl/StrictProducer.scala index 7280fef0dc..e18dae49cb 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/StrictProducer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/StrictProducer.scala @@ -6,8 +6,8 @@ package akka.stream.impl import java.util.concurrent.atomic.AtomicBoolean import scala.annotation.tailrec import scala.concurrent.ExecutionContext -import asyncrx.spi -import asyncrx.api.Consumer +import org.reactivestreams.spi +import org.reactivestreams.api.Consumer /** * INTERNAL API diff --git a/akka-stream/src/test/scala/akka/stream/IdentityProcessorTest.scala b/akka-stream/src/test/scala/akka/stream/IdentityProcessorTest.scala index 7903f14301..83b0767712 100644 --- a/akka-stream/src/test/scala/akka/stream/IdentityProcessorTest.scala +++ b/akka-stream/src/test/scala/akka/stream/IdentityProcessorTest.scala @@ -4,9 +4,9 @@ package akka.stream import org.scalatest.testng.TestNGSuiteLike -import asyncrx.spi.Publisher -import asyncrx.api.Processor -import asyncrx.tck.IdentityProcessorVerification +import org.reactivestreams.spi.Publisher +import org.reactivestreams.api.Processor +import org.reactivestreams.tck.IdentityProcessorVerification import akka.actor.Props import akka.stream.impl.ActorProcessor import akka.stream.impl.TransformProcessorImpl diff --git a/akka-stream/src/test/scala/akka/stream/IteratorProducerTest.scala b/akka-stream/src/test/scala/akka/stream/IteratorProducerTest.scala index aadb86c099..58f0773fda 100644 --- a/akka-stream/src/test/scala/akka/stream/IteratorProducerTest.scala +++ b/akka-stream/src/test/scala/akka/stream/IteratorProducerTest.scala @@ -4,8 +4,8 @@ package akka.stream import org.scalatest.testng.TestNGSuiteLike -import asyncrx.spi.Publisher -import asyncrx.tck.PublisherVerification +import org.reactivestreams.spi.Publisher +import org.reactivestreams.tck.PublisherVerification import akka.stream.testkit.TestProducer class IteratorProducerTest extends PublisherVerification[Int] with WithActorSystem with TestNGSuiteLike { diff --git a/akka-stream/src/test/scala/akka/stream/StreamSpec.scala b/akka-stream/src/test/scala/akka/stream/StreamSpec.scala index 35bd69854e..d2cfcd18ea 100644 --- a/akka-stream/src/test/scala/akka/stream/StreamSpec.scala +++ b/akka-stream/src/test/scala/akka/stream/StreamSpec.scala @@ -6,7 +6,7 @@ package akka.stream import scala.concurrent.duration._ import akka.stream.testkit.StreamTestKit import akka.testkit._ -import asyncrx.api.Producer +import org.reactivestreams.api.Producer import org.scalatest.FreeSpecLike @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-stream/src/test/scala/akka/stream/testkit/ConsumerProbe.scala b/akka-stream/src/test/scala/akka/stream/testkit/ConsumerProbe.scala index e3a6f1f4ae..2e279ef4ce 100644 --- a/akka-stream/src/test/scala/akka/stream/testkit/ConsumerProbe.scala +++ b/akka-stream/src/test/scala/akka/stream/testkit/ConsumerProbe.scala @@ -4,8 +4,8 @@ package akka.stream.testkit import scala.concurrent.duration.FiniteDuration -import asyncrx.api.Consumer -import asyncrx.spi.Subscription +import org.reactivestreams.api.Consumer +import org.reactivestreams.spi.Subscription sealed trait ConsumerEvent case class OnSubscribe(subscription: Subscription) extends ConsumerEvent diff --git a/akka-stream/src/test/scala/akka/stream/testkit/ProducerProbe.scala b/akka-stream/src/test/scala/akka/stream/testkit/ProducerProbe.scala index f0a7636971..ddef3d5b42 100644 --- a/akka-stream/src/test/scala/akka/stream/testkit/ProducerProbe.scala +++ b/akka-stream/src/test/scala/akka/stream/testkit/ProducerProbe.scala @@ -3,10 +3,10 @@ */ package akka.stream.testkit -import asyncrx.spi.{ Subscriber, Subscription } -import asyncrx.api.Producer +import org.reactivestreams.spi.{ Subscriber, Subscription } +import org.reactivestreams.api.Producer import scala.concurrent.duration.FiniteDuration -import asyncrx.api.Consumer +import org.reactivestreams.api.Consumer sealed trait ProducerEvent case class Subscribe(subscription: Subscription) extends ProducerEvent diff --git a/akka-stream/src/test/scala/akka/stream/testkit/StreamTestKit.scala b/akka-stream/src/test/scala/akka/stream/testkit/StreamTestKit.scala index de42d74d73..b6288fd786 100644 --- a/akka-stream/src/test/scala/akka/stream/testkit/StreamTestKit.scala +++ b/akka-stream/src/test/scala/akka/stream/testkit/StreamTestKit.scala @@ -4,8 +4,8 @@ package akka.stream.testkit import akka.testkit.TestProbe -import asyncrx.spi.{ Publisher, Subscriber, Subscription } -import asyncrx.tck._ +import org.reactivestreams.spi.{ Publisher, Subscriber, Subscription } +import org.reactivestreams.tck._ import akka.actor.ActorSystem import scala.concurrent.duration.FiniteDuration import scala.annotation.tailrec diff --git a/akka-stream/src/test/scala/akka/stream/testkit/TestProducer.scala b/akka-stream/src/test/scala/akka/stream/testkit/TestProducer.scala index b256b961b8..192857545c 100644 --- a/akka-stream/src/test/scala/akka/stream/testkit/TestProducer.scala +++ b/akka-stream/src/test/scala/akka/stream/testkit/TestProducer.scala @@ -3,12 +3,12 @@ */ package akka.stream.testkit -import asyncrx.api.Producer +import org.reactivestreams.api.Producer import akka.stream.impl.IteratorProducer import scala.concurrent.ExecutionContext -import asyncrx.spi.Subscriber -import asyncrx.spi.Publisher -import asyncrx.api.Consumer +import org.reactivestreams.spi.Subscriber +import org.reactivestreams.spi.Publisher +import org.reactivestreams.api.Consumer object TestProducer { def apply[T](iterable: Iterable[T])(implicit executor: ExecutionContext): Producer[T] = apply(iterable.iterator)