diff --git a/.travis.yml b/.travis.yml index 112defb397..9236f0cf51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,14 +61,13 @@ jobs: - env: - DIR=geode - PRE_CMD="docker-compose up -d geode" - - CMD=+geode/testChanged - - env: CMD=+google-cloud-pub-sub/testChanged - - env: CMD=+google-cloud-storage/testChanged - env: - DIR=google-cloud-pub-sub - env: - DIR=google-cloud-pub-sub-grpc - PRE_CMD="docker-compose up -d gcloud-pubsub-emulator_prep" + - env: + - DIR=google-cloud-storage - env: - DIR=google-fcm - env: diff --git a/build.sbt b/build.sbt index 2bfb7e1d85..03c46b2a07 100644 --- a/build.sbt +++ b/build.sbt @@ -174,7 +174,8 @@ lazy val googleCloudPubSubGrpc = alpakkaProject( crossScalaVersions --= Seq(Dependencies.Scala211, Dependencies.Scala213) // https://github.com/akka/akka-grpc/pull/599 ).enablePlugins(AkkaGrpcPlugin, JavaAgent) -lazy val googleCloudStorage = alpakkaProject("google-cloud-storage", "google.cloud.storage", Dependencies.GoogleStorage) +lazy val googleCloudStorage = + alpakkaProject("google-cloud-storage", "google.cloud.storage", Dependencies.GoogleStorage).disablePlugins(MimaPlugin) lazy val googleFcm = alpakkaProject( "google-fcm", @@ -184,9 +185,6 @@ lazy val googleFcm = alpakkaProject( crossScalaVersions -= Dependencies.Scala213 // requires upgrade of jwt-core to 3.0.1 ) -lazy val googleCloudStorage = - alpakkaProject("google-cloud-storage", "google.cloud.storage", Dependencies.GoogleStorage).disablePlugins(MimaPlugin) - lazy val hbase = alpakkaProject("hbase", "hbase", Dependencies.HBase, fork in Test := true) lazy val hdfs = alpakkaProject("hdfs", diff --git a/docs/src/main/paradox/google-cloud-storage.md b/docs/src/main/paradox/google-cloud-storage.md index c102fd0f43..2ee34b7e73 100644 --- a/docs/src/main/paradox/google-cloud-storage.md +++ b/docs/src/main/paradox/google-cloud-storage.md @@ -1,9 +1,9 @@ -# Google Cloud Storage +# Google Cloud Storage Google Cloud Storage allows world-wide storage and retrieval of any amount of data at any time. Further information at the official [Google Cloud Storage documentation website](https://cloud.google.com/storage/docs/). -This connector communicates to Cloud Storage via HTTP requests. +This connector communicates to Cloud Storage via HTTP requests. @@project-info{ projectId="google-cloud-storage" } @@ -124,7 +124,7 @@ Java : @@snip [snip](/google-cloud-storage/src/test/java/docs/javadsl/GCStorageTest.java) { #delete-bucket } -### Get bucket +### Get bucket To get a bucket you need to specify its name. Scala @@ -151,6 +151,3 @@ Java ``` > Some test code requires access to Google cloud storage, to run them you will need to configure a project and pub/sub in google cloud and provide your own credentials. - - - diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/Bucket.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/Bucket.scala index 54eadc0414..fff6170d20 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/Bucket.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/Bucket.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala index eeaf3fc83c..29595930a2 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/ObjectNotFoundException.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/ObjectNotFoundException.scala index 3f1428c1ed..b43fa6a9d4 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/ObjectNotFoundException.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/ObjectNotFoundException.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala index da53d99e8e..6a8321f0ca 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageSettings.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageSettings.scala index 7a219824d9..c3263809f1 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageSettings.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageSettings.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketInfo.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketInfo.scala index 35d2392698..c0a84326ea 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketInfo.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketInfo.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketListResult.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketListResult.scala index 92c003dfe5..9c67f5012f 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketListResult.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketListResult.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Chunker.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Chunker.scala index 15d2c1d853..39b2b947de 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Chunker.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Chunker.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl @@ -23,7 +23,7 @@ private[storage] class Chunker(val chunkSize: Int) extends GraphStage[FlowShape[ override def createLogic(inheritedAttributes: Attributes): GraphStageLogic = new GraphStageLogic(shape) { private val bufferBuilder = ByteString.newBuilder - private var totalSize = 0l + private var totalSize = 0L setHandler(out, new OutHandler { override def onPull(): Unit = diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Formats.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Formats.scala index aea85fd974..323014d5b1 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Formats.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Formats.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleSession.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleSession.scala index a0df9d880b..8ef6960332 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleSession.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleSession.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApi.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApi.scala index 1c3b30dce0..48c844af32 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApi.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApi.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/MultiPartUpload.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/MultiPartUpload.scala index aee385888d..659716397e 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/MultiPartUpload.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/MultiPartUpload.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/RewriteResponse.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/RewriteResponse.scala index 11d1602898..e77fa678c8 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/RewriteResponse.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/RewriteResponse.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/TokenApiSettings.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/TokenApiSettings.scala index 74e21d8a3d..30b722a6aa 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/TokenApiSettings.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/TokenApiSettings.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/WithMaterializerGlobal.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/WithMaterializerGlobal.scala index 3d7f2f757a..c38a8a471e 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/WithMaterializerGlobal.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/WithMaterializerGlobal.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/ChunkerSpec.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/ChunkerSpec.scala index 5ae3249ff5..e0629e5ac1 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/ChunkerSpec.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/ChunkerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApiSpec.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApiSpec.scala index bbb60e46d9..e77e0d2ebb 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApiSpec.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApiSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.impl diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala index 719b37d315..f6b4ca6ec4 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Lightbend Inc. + * Copyright (C) 2016-2019 Lightbend Inc. */ package akka.stream.alpakka.googlecloud.storage.scaladsl @@ -95,7 +95,7 @@ abstract class GCStorageWiremockBase(_system: ActorSystem, _wireMockServer: Wire .post( urlEqualTo(s"/b?project=testX-XXXXX") ) - .withRequestBody(WireMock.equalTo(createBucketJsonRequest)) + .withRequestBody(WireMock.equalToJson(createBucketJsonRequest)) .withHeader("Authorization", WireMock.equalTo("Bearer " + TestCredentials.accessToken)) .willReturn( aResponse() @@ -113,7 +113,7 @@ abstract class GCStorageWiremockBase(_system: ActorSystem, _wireMockServer: Wire .post( urlEqualTo(s"/b?project=testX-XXXXX") ) - .withRequestBody(WireMock.equalTo(createBucketJsonRequest)) + .withRequestBody(WireMock.equalToJson(createBucketJsonRequest)) .withHeader("Authorization", WireMock.equalTo("Bearer " + TestCredentials.accessToken)) .willReturn( aResponse() diff --git a/project/project-info.conf b/project/project-info.conf index 69025d9e62..a3b8854cd0 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -302,7 +302,7 @@ project-info { { readiness: CommunityDriven since: "2019-06-06" - since-version: "1.0-M2" + since-version: "1.0.3" } ] api-docs: [