Merge branch 'master' into absolutePaths

guersam · Nov 11, 2017 · 818ba26 · 818ba26
2 parents 708865d + 66a49fd
commit 818ba26
Show file tree

Hide file tree

Showing 390 changed files with 2,504 additions and 285 deletions.
diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnector.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnector.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import akka.stream.stage.GraphStageLogic

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpRpcFlowStage.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpRpcFlowStage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpSinkStage.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpSinkStage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import java.util.Optional

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpSourceStage.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpSourceStage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/AmqpRpcFlow.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/AmqpRpcFlow.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.javadsl
 
 import java.util.concurrent.CompletionStage

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/AmqpSink.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/AmqpSink.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.javadsl
 
 import java.util.concurrent.CompletionStage

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/AmqpSource.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/AmqpSource.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.javadsl
 
 import akka.NotUsed

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/CommittableIncomingMessage.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/CommittableIncomingMessage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.javadsl
 
 import java.util.concurrent.CompletionStage
@@ -12,4 +13,4 @@ trait CommittableIncomingMessage {
   val message: IncomingMessage
   def ack(multiple: Boolean = false): CompletionStage[Done]
   def nack(multiple: Boolean = false, requeue: Boolean = true): CompletionStage[Done]
-}
+}
diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/package.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/javadsl/package.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import java.util.concurrent.CompletionStage

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/model.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/model.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import com.rabbitmq.client.ExceptionHandler

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/package.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/package.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka
 
 package object amqp {

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/AmqpRpcFlow.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/AmqpRpcFlow.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.scaladsl
 
 import akka.dispatch.ExecutionContexts

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/AmqpSink.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/AmqpSink.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.scaladsl
 
 import akka.Done

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/AmqpSource.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/AmqpSource.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.scaladsl
 
 import akka.NotUsed

diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/CommittableIncomingMessage.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/scaladsl/CommittableIncomingMessage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.scaladsl
 
 import akka.Done

diff --git a/amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/AmqpConnectorsTest.java b/amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/AmqpConnectorsTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.javadsl;
 
 import static org.junit.Assert.assertEquals;

diff --git a/amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/package.scala b/amqp/src/test/java/akka/stream/alpakka/amqp/javadsl/package.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import java.util.concurrent.CompletionStage

diff --git a/amqp/src/test/scala/akka/stream/alpakka/amqp/AmqpSpec.scala b/amqp/src/test/scala/akka/stream/alpakka/amqp/AmqpSpec.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp
 
 import akka.actor.ActorSystem

diff --git a/amqp/src/test/scala/akka/stream/alpakka/amqp/scaladsl/AmqpConnectorsSpec.scala b/amqp/src/test/scala/akka/stream/alpakka/amqp/scaladsl/AmqpConnectorsSpec.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.amqp.scaladsl
 
 import akka.Done

diff --git a/awslambda/src/main/scala/akka/stream/alpakka/awslambda/AwsLambdaFlowStage.scala b/awslambda/src/main/scala/akka/stream/alpakka/awslambda/AwsLambdaFlowStage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda
 
 import akka.stream.stage.{GraphStage, GraphStageLogic, InHandler, OutHandler}

diff --git a/awslambda/src/main/scala/akka/stream/alpakka/awslambda/javadsl/AwsLambdaFlow.scala b/awslambda/src/main/scala/akka/stream/alpakka/awslambda/javadsl/AwsLambdaFlow.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda.javadsl
 
 import akka.NotUsed

diff --git a/awslambda/src/main/scala/akka/stream/alpakka/awslambda/scaladsl/AwsLambdaFlow.scala b/awslambda/src/main/scala/akka/stream/alpakka/awslambda/scaladsl/AwsLambdaFlow.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda.scaladsl
 
 import akka.NotUsed

diff --git a/awslambda/src/test/java/akka/stream/alpakka/awslambda/javadsl/AwsLambdaFlowTest.java b/awslambda/src/test/java/akka/stream/alpakka/awslambda/javadsl/AwsLambdaFlowTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda.javadsl;
 
 import akka.NotUsed;

diff --git a/awslambda/src/test/java/akka/stream/alpakka/awslambda/javadsl/Examples.java b/awslambda/src/test/java/akka/stream/alpakka/awslambda/javadsl/Examples.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda.javadsl;
 
 import akka.NotUsed;

diff --git a/awslambda/src/test/scala/akka/stream/alpakka/awslambda/scaladsl/AwsLambdaFlowSpec.scala b/awslambda/src/test/scala/akka/stream/alpakka/awslambda/scaladsl/AwsLambdaFlowSpec.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda.scaladsl
 
 import java.util.concurrent.{CompletableFuture, Future}

diff --git a/awslambda/src/test/scala/akka/stream/alpakka/awslambda/scaladsl/Examples.scala b/awslambda/src/test/scala/akka/stream/alpakka/awslambda/scaladsl/Examples.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.awslambda.scaladsl
 
 import java.util.concurrent.Executors

diff --git a/...queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/AzureQueueSinkFunctions.scala b/...queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/AzureQueueSinkFunctions.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue
 
 import com.microsoft.azure.storage.queue.{CloudQueue, CloudQueueMessage}

diff --git a/...e-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/AzureQueueSourceStage.scala b/...e-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/AzureQueueSourceStage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue
 
 import com.microsoft.azure.storage.queue.{CloudQueue, CloudQueueMessage}

diff --git a/...-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/javadsl/AzureQueueSink.scala b/...-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/javadsl/AzureQueueSink.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue.javadsl
 
 import com.microsoft.azure.storage.queue.{CloudQueue, CloudQueueMessage}

diff --git a/...ueue/src/main/scala/akka/stream/alpakka/azure/storagequeue/javadsl/AzureQueueSource.scala b/...ueue/src/main/scala/akka/stream/alpakka/azure/storagequeue/javadsl/AzureQueueSource.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue.javadsl
 
 import com.microsoft.azure.storage.queue.{CloudQueue, CloudQueueMessage}

diff --git a/...queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/scaladsl/AzureQueueSink.scala b/...queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/scaladsl/AzureQueueSink.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue.scaladsl
 
 import com.microsoft.azure.storage.queue.{CloudQueue, CloudQueueMessage}

diff --git a/...eue/src/main/scala/akka/stream/alpakka/azure/storagequeue/scaladsl/AzureQueueSource.scala b/...eue/src/main/scala/akka/stream/alpakka/azure/storagequeue/scaladsl/AzureQueueSource.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue.scaladsl
 
 import com.microsoft.azure.storage.queue.{CloudQueue, CloudQueueMessage}

diff --git a/...orage-queue/src/test/java/akka/stream/alpakka/azure/storagequeue/javadsl/JavaDslTest.java b/...orage-queue/src/test/java/akka/stream/alpakka/azure/storagequeue/javadsl/JavaDslTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue.javadsl;
 
 import akka.Done;

diff --git a/...queue/src/test/scala/akka/stream/alpakka/azure/storagequeue/scaladsl/AzureQueueSpec.scala b/...queue/src/test/scala/akka/stream/alpakka/azure/storagequeue/scaladsl/AzureQueueSpec.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.azure.storagequeue.scaladsl
 
 import org.scalatest._

diff --git a/build.sbt b/build.sbt
@@ -159,10 +159,12 @@ lazy val docs = project
     paradoxGroups := Map("Language" -> Seq("Scala", "Java")),
     paradoxProperties in Local ++= Map(
       // point API doc links to locally generated API docs
-      "scaladoc.akka.stream.alpakka.base_url" -> rebase(
-        (baseDirectory in alpakka).value,
-        "../../../../../"
-      )((sbtunidoc.Plugin.UnidocKeys.unidoc in alpakka in Compile).value.head).get
+      "scaladoc.akka.stream.alpakka.base_url" -> sbt.io.Path
+        .rebase(
+          (baseDirectory in alpakka).value,
+          "../../../../../"
+        )((sbtunidoc.BaseUnidocPlugin.autoImport.unidoc in alpakka in Compile).value.head)
+        .get
     )
   )
 

diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraSourceStage.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraSourceStage.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra
 
 import akka.stream._

diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/GuavaFutures.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/GuavaFutures.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra
 
 import com.google.common.util.concurrent.{FutureCallback, Futures, ListenableFuture}

diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSink.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSink.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra.javadsl
 
 import java.util.concurrent.CompletionStage

diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSource.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSource.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra.javadsl
 
 import java.util.concurrent.CompletableFuture

diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSink.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSink.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra.scaladsl
 
 import akka.Done

diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSource.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSource.scala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra.scaladsl
 
 import akka.NotUsed

diff --git a/cassandra/src/test/java/akka/stream/alpakka/cassandra/javadsl/CassandraSourceTest.java b/cassandra/src/test/java/akka/stream/alpakka/cassandra/javadsl/CassandraSourceTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra.javadsl;
 
 import akka.Done;

diff --git a/cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSourceSpec.scala b/cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSourceSpec.scala
@@ -1,12 +1,13 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.cassandra.scaladsl
 
 import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.{Sink, Source}
-import com.datastax.driver.core.{Cluster, PreparedStatement, SimpleStatement, SocketOptions}
+import com.datastax.driver.core.{Cluster, PreparedStatement, SimpleStatement}
 import org.scalatest._
 import org.scalatest.concurrent.ScalaFutures
 
@@ -33,10 +34,6 @@ class CassandraSourceSpec
   implicit val session = Cluster.builder
     .addContactPoint("127.0.0.1")
     .withPort(9042)
-    .withSocketOptions(
-      new SocketOptions()
-        .setConnectTimeoutMillis(20 * 1000)
-    )
     .build
     .connect()
   //#init-session

diff --git a/csv/src/main/java/akka/stream/alpakka/csv/javadsl/ByteOrderMark.java b/csv/src/main/java/akka/stream/alpakka/csv/javadsl/ByteOrderMark.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.csv.javadsl;
 
 import akka.util.ByteString;

diff --git a/csv/src/main/java/akka/stream/alpakka/csv/javadsl/CsvFormatting.java b/csv/src/main/java/akka/stream/alpakka/csv/javadsl/CsvFormatting.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016-2017 Lightbend Inc. <http://www.lightbend.com>
  */
+
 package akka.stream.alpakka.csv.javadsl;
 
 import akka.NotUsed;