diff --git a/.travis.yml b/.travis.yml index c5b26ed8..5424595f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ scala: - 2.13.0-M3 script: - - sbt ++$TRAVIS_SCALA_VERSION 'testOnly -- xonly timefactor 5' mimaReportBinaryIssues doc + - sbt ++$TRAVIS_SCALA_VERSION 'testOnly -- xonly timefactor 5' mimaReportBinaryIssues validateCode doc cache: directories: diff --git a/build.sbt b/build.sbt index 1b1102e9..5e13355e 100644 --- a/build.sbt +++ b/build.sbt @@ -182,7 +182,13 @@ lazy val commonSettings = mimaSettings ++ Seq( ), javacOptions in (Compile, doc) ++= javacSettings, javacOptions in Test ++= javacSettings, - javacOptions in IntegrationTest ++= javacSettings + javacOptions in IntegrationTest ++= javacSettings, + headerLicense := { + val currentYear = java.time.Year.now(java.time.Clock.systemUTC).getValue + Some(HeaderLicense.Custom( + s"Copyright (C) 2009-$currentYear Lightbend Inc. " + )) + } ) val formattingSettings = Seq( @@ -347,7 +353,7 @@ lazy val shaded = Project(id = "shaded", base = file("shaded") ) .aggregate( `shaded-asynchttpclient`, `shaded-oauth` - ).disablePlugins(sbtassembly.AssemblyPlugin) + ).disablePlugins(sbtassembly.AssemblyPlugin, HeaderPlugin) .settings( disableDocs, disablePublishing, @@ -523,3 +529,20 @@ releaseProcess := Seq[ReleaseStep]( releaseStepCommand("sonatypeRelease"), pushChanges ) + +lazy val checkCodeFormat = taskKey[Unit]("Check that code format is following Scalariform rules") + +checkCodeFormat := { + import scala.sys.process._ + val exitCode = "git diff --exit-code".! + if (exitCode != 0) { + sys.error( + """ + |ERROR: Scalariform check failed, see differences above. + |To fix, format your sources using sbt scalariformFormat test:scalariformFormat before submitting a pull request. + |Additionally, please squash your commits (eg, use git commit --amend) if you're going to update this pull request. + """.stripMargin) + } +} + +addCommandAlias("validateCode", ";scalariformFormat;test:scalariformFormat;headerCheck;test:headerCheck;checkCodeFormat") \ No newline at end of file diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala b/integration-tests/src/test/java/play/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala index a95d17ae..601c9ad2 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala +++ b/integration-tests/src/test/java/play/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc import akka.http.scaladsl.server.Route diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/ByteStringRequestTest.java b/integration-tests/src/test/java/play/libs/ws/ahc/ByteStringRequestTest.java index 8b831475..b785617d 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/ByteStringRequestTest.java +++ b/integration-tests/src/test/java/play/libs/ws/ahc/ByteStringRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/CallbackRequestFilter.java b/integration-tests/src/test/java/play/libs/ws/ahc/CallbackRequestFilter.java index 275d6cdd..47f36882 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/CallbackRequestFilter.java +++ b/integration-tests/src/test/java/play/libs/ws/ahc/CallbackRequestFilter.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc; import play.libs.ws.*; diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/HeaderAppendingFilter.java b/integration-tests/src/test/java/play/libs/ws/ahc/HeaderAppendingFilter.java index a8093f75..ee2a68dd 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/HeaderAppendingFilter.java +++ b/integration-tests/src/test/java/play/libs/ws/ahc/HeaderAppendingFilter.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc; import play.libs.ws.*; diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java b/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java index 54574647..a0ddbba8 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java +++ b/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/StandaloneWSClientSupport.scala b/integration-tests/src/test/java/play/libs/ws/ahc/StandaloneWSClientSupport.scala index a52d1db4..eeabc37c 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/StandaloneWSClientSupport.scala +++ b/integration-tests/src/test/java/play/libs/ws/ahc/StandaloneWSClientSupport.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc import akka.stream.Materializer diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/XMLRequestTest.java b/integration-tests/src/test/java/play/libs/ws/ahc/XMLRequestTest.java index fcd98a63..2a81494e 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/XMLRequestTest.java +++ b/integration-tests/src/test/java/play/libs/ws/ahc/XMLRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/integration-tests/src/test/scala/play/AkkaServerProvider.scala b/integration-tests/src/test/scala/play/AkkaServerProvider.scala index ae890818..68bfe51b 100644 --- a/integration-tests/src/test/scala/play/AkkaServerProvider.scala +++ b/integration-tests/src/test/scala/play/AkkaServerProvider.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play import akka.actor.ActorSystem diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala index d095645b..bc6d65ec 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcCurlRequestLoggerSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import akka.http.scaladsl.server.Route diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSClientSpec.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSClientSpec.scala index 0325e3e3..2dc71e62 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSClientSpec.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSClientSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import akka.http.scaladsl.server.Route diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestFilterSpec.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestFilterSpec.scala index fd2e9c06..10dff5d9 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestFilterSpec.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestFilterSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/JsonRequestSpec.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/JsonRequestSpec.scala index c236d677..d0613e09 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/JsonRequestSpec.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/JsonRequestSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/StandaloneWSClientSupport.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/StandaloneWSClientSupport.scala index 84c614f0..70bf40c6 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/StandaloneWSClientSupport.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/StandaloneWSClientSupport.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import akka.stream.Materializer diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/XMLRequestSpec.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/XMLRequestSpec.scala index f8781292..a03381cf 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/XMLRequestSpec.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/XMLRequestSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc diff --git a/integration-tests/src/test/scala/play/api/libs/ws/ahc/cache/CachingSpec.scala b/integration-tests/src/test/scala/play/api/libs/ws/ahc/cache/CachingSpec.scala index 7bb1a746..4c3a5d8a 100644 --- a/integration-tests/src/test/scala/play/api/libs/ws/ahc/cache/CachingSpec.scala +++ b/integration-tests/src/test/scala/play/api/libs/ws/ahc/cache/CachingSpec.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSClientSpec.scala b/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSClientSpec.scala index 1463f5d6..16fe51b1 100644 --- a/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSClientSpec.scala +++ b/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSClientSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2016 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc import akka.http.scaladsl.server.Route diff --git a/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSRequestFilterSpec.scala b/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSRequestFilterSpec.scala index cf6fc43b..16ffa4df 100644 --- a/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSRequestFilterSpec.scala +++ b/integration-tests/src/test/scala/play/libs/ws/ahc/AhcWSRequestFilterSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2016 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc import akka.http.scaladsl.model.{ ContentTypes, HttpEntity } diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/oauth/OAuth.java b/play-ahc-ws-standalone/src/main/java/play/libs/oauth/OAuth.java index 61d02a50..83620d74 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/oauth/OAuth.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/oauth/OAuth.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.oauth; import play.shaded.oauth.oauth.signpost.OAuthConsumer; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcCurlRequestLogger.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcCurlRequestLogger.java index 1c6d915f..3a445db6 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcCurlRequestLogger.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcCurlRequestLogger.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc; import play.libs.ws.InMemoryBodyWritable; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcWSClientConfigFactory.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcWSClientConfigFactory.java index 96610384..1eef9693 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcWSClientConfigFactory.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/AhcWSClientConfigFactory.java @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/CookieBuilder.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/CookieBuilder.java index 77dd9a68..4905bd5d 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/CookieBuilder.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/CookieBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java index e95a850f..046ebcfe 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSClient.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSRequest.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSRequest.java index ef9855a4..6eba19b8 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSRequest.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSResponse.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSResponse.java index 603dd99b..30786536 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSResponse.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StandaloneAhcWSResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws.ahc; diff --git a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StreamedResponse.java b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StreamedResponse.java index 89d2f70f..bfa2a504 100644 --- a/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StreamedResponse.java +++ b/play-ahc-ws-standalone/src/main/java/play/libs/ws/ahc/StreamedResponse.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc; import akka.stream.javadsl.Source; diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/oauth/OAuth.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/oauth/OAuth.scala index 15fbfd57..49f23e3e 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/oauth/OAuth.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/oauth/OAuth.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.oauth import play.shaded.oauth.oauth.signpost.basic.DefaultOAuthConsumer diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala index fcb4f94f..41893b19 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcConfig.scala @@ -1,8 +1,7 @@ /* - * - * * Copyright (C) 2009-2016 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import java.security.KeyStore diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcCurlRequestLogger.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcCurlRequestLogger.scala index 165dea62..bfc0e4cd 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcCurlRequestLogger.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcCurlRequestLogger.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import java.nio.charset.StandardCharsets diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcLoggerFactory.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcLoggerFactory.scala index 9fe091c2..9c440061 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcLoggerFactory.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcLoggerFactory.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import com.typesafe.sslconfig.util.{ LoggerFactory, NoDepsLogger } diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcUtilities.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcUtilities.scala index 39de4301..750edc36 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcUtilities.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcUtilities.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcWSUtils.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcWSUtils.scala index 75ad645e..3b6b948a 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcWSUtils.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcWSUtils.scala @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2009-2019 Lightbend Inc. + */ + package play.api.libs.ws.ahc import play.shaded.ahc.org.asynchttpclient.util.HttpUtils diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CaseInsensitiveOrdered.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CaseInsensitiveOrdered.scala index 2cb7855a..0333fce2 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CaseInsensitiveOrdered.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CaseInsensitiveOrdered.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc /** diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CookieBuilder.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CookieBuilder.scala index 195d457c..5bd727e1 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CookieBuilder.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/CookieBuilder.scala @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2009-2019 Lightbend Inc. + */ + package play.api.libs.ws.ahc import play.api.libs.ws.{ DefaultWSCookie, WSCookie } diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/FormUrlEncodedParser.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/FormUrlEncodedParser.scala index 7e1b2270..ecc9722b 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/FormUrlEncodedParser.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/FormUrlEncodedParser.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc /** An object for parsing application/x-www-form-urlencoded data */ diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/OrderPreserving.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/OrderPreserving.scala index 9113e4d7..f6e6195d 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/OrderPreserving.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/OrderPreserving.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import scala.collection.immutable.ListMap diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala index 995ef162..16317ea7 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSClient.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import javax.inject.Inject diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala index e0985c8f..325bee64 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSRequest.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import java.io.UnsupportedEncodingException diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSResponse.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSResponse.scala index ab3aecb0..9b23e750 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSResponse.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StandaloneAhcWSResponse.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import akka.stream.scaladsl.Source diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/Streamed.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/Streamed.scala index 5dd30742..0bc87e3b 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/Streamed.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/Streamed.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import java.net.URI diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StreamedResponse.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StreamedResponse.scala index 611a2c93..b17c072b 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StreamedResponse.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/StreamedResponse.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import akka.stream.scaladsl.Source diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AhcHttpCache.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AhcHttpCache.scala index cd1ceb48..06d82169 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AhcHttpCache.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AhcHttpCache.scala @@ -1,7 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc.cache import java.net.URI diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AsyncCachingHandler.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AsyncCachingHandler.scala index 698bfa82..a349d13a 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AsyncCachingHandler.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/AsyncCachingHandler.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandler.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandler.scala index 2cfa05a9..a89b09a7 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandler.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandler.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Cache.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Cache.scala index 9968927b..cea54f86 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Cache.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Cache.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheAsyncConnection.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheAsyncConnection.scala index 54544a0e..bccf4975 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheAsyncConnection.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheAsyncConnection.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheableResponse.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheableResponse.scala index 5afcf2df..fc694f8f 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheableResponse.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CacheableResponse.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CachingAsyncHttpClient.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CachingAsyncHttpClient.scala index f563609f..4be55da0 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CachingAsyncHttpClient.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/CachingAsyncHttpClient.scala @@ -1,7 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc.cache import java.io._ diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Debug.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Debug.scala index de75f4ff..84f63691 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Debug.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/Debug.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/EffectiveURIKey.scala b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/EffectiveURIKey.scala index 7ca5755e..23387fd9 100644 --- a/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/EffectiveURIKey.scala +++ b/play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/cache/EffectiveURIKey.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/oauth/OAuthSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/oauth/OAuthSpec.scala index 6c0a5b2d..279265fd 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/oauth/OAuthSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/oauth/OAuthSpec.scala @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2009-2019 Lightbend Inc. + */ + package play.api.libs.oauth import org.specs2.mutable.Specification diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcConfigBuilderSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcConfigBuilderSpec.scala index 0600032d..e190677d 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcConfigBuilderSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcConfigBuilderSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import com.typesafe.config.{ Config, ConfigFactory } diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSClientConfigParserSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSClientConfigParserSpec.scala index 25557fc8..720f19c4 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSClientConfigParserSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSClientConfigParserSpec.scala @@ -1,8 +1,7 @@ /* - * - * * Copyright (C) 2009-2016 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import com.typesafe.config.ConfigFactory diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestSpec.scala index 98c69d31..99cff0a0 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSRequestSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import akka.actor.ActorSystem diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSResponseSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSResponseSpec.scala index 708c1eb1..88aba204 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSResponseSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/AhcWSResponseSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc import java.nio.charset.StandardCharsets diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/AhcWSCacheSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/AhcWSCacheSpec.scala index 9bfce40a..89c15966 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/AhcWSCacheSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/AhcWSCacheSpec.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandlerSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandlerSpec.scala index be2d228a..56feac37 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandlerSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/BackgroundAsyncHandlerSpec.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws.ahc.cache diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheAsyncHandlerSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheAsyncHandlerSpec.scala index 847849db..790bd38d 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheAsyncHandlerSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheAsyncHandlerSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc.cache import org.specs2.mutable.Specification diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheableResponseSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheableResponseSpec.scala index 8331ba94..95c82cd9 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheableResponseSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/CacheableResponseSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc.cache import org.specs2.mutable.Specification diff --git a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/StubHttpCache.scala b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/StubHttpCache.scala index 87e9e6ec..86614393 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/StubHttpCache.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/api/libs/ws/ahc/cache/StubHttpCache.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws.ahc.cache import scala.collection.mutable diff --git a/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSRequestSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSRequestSpec.scala index 43b7a543..89754d04 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSRequestSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSRequestSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc import java.time.Duration diff --git a/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSResponseSpec.scala b/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSResponseSpec.scala index 7f66f06d..c5cf7f22 100644 --- a/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSResponseSpec.scala +++ b/play-ahc-ws-standalone/src/test/scala/play/libs/ws/ahc/AhcWSResponseSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws.ahc import java.nio.charset.StandardCharsets diff --git a/play-ws-standalone-json/src/main/java/play/libs/ws/DefaultObjectMapper.java b/play-ws-standalone-json/src/main/java/play/libs/ws/DefaultObjectMapper.java index 03dcf6f2..f149face 100644 --- a/play-ws-standalone-json/src/main/java/play/libs/ws/DefaultObjectMapper.java +++ b/play-ws-standalone-json/src/main/java/play/libs/ws/DefaultObjectMapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java index 54c5299d..b84bcde1 100644 --- a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java +++ b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java index a56f4b4c..8adf0f72 100644 --- a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java +++ b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyReadables.scala b/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyReadables.scala index f77998ce..674b1844 100644 --- a/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyReadables.scala +++ b/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyReadables.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala b/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala index 84a997d0..2684edb7 100644 --- a/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala +++ b/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone-json/src/test/scala/play/api/libs/ws/JsonBodyReadablesSpec.scala b/play-ws-standalone-json/src/test/scala/play/api/libs/ws/JsonBodyReadablesSpec.scala index 813f6e0b..53295f66 100644 --- a/play-ws-standalone-json/src/test/scala/play/api/libs/ws/JsonBodyReadablesSpec.scala +++ b/play-ws-standalone-json/src/test/scala/play/api/libs/ws/JsonBodyReadablesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone-xml/src/main/java/play/libs/ws/XML.java b/play-ws-standalone-xml/src/main/java/play/libs/ws/XML.java index c066c350..691a1e5b 100644 --- a/play-ws-standalone-xml/src/main/java/play/libs/ws/XML.java +++ b/play-ws-standalone-xml/src/main/java/play/libs/ws/XML.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; import akka.util.ByteString; diff --git a/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyReadables.java b/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyReadables.java index be0652c2..d091b4de 100644 --- a/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyReadables.java +++ b/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyReadables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyWritables.java b/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyWritables.java index ad3151f7..566cbb09 100644 --- a/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyWritables.java +++ b/play-ws-standalone-xml/src/main/java/play/libs/ws/XMLBodyWritables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XML.scala b/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XML.scala index 811f663b..e416465e 100644 --- a/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XML.scala +++ b/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XML.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyReadables.scala b/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyReadables.scala index f700d02d..5b6009fc 100644 --- a/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyReadables.scala +++ b/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyReadables.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyWritables.scala b/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyWritables.scala index 3a8f9730..4bc21826 100644 --- a/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyWritables.scala +++ b/play-ws-standalone-xml/src/main/scala/play/api/libs/ws/XMLBodyWritables.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone/src/main/java/play/libs/ws/BodyReadable.java b/play-ws-standalone/src/main/java/play/libs/ws/BodyReadable.java index c7431943..707290bd 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/BodyReadable.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/BodyReadable.java @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2009-2019 Lightbend Inc. + */ + package play.libs.ws; import java.util.function.Function; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/BodyWritable.java b/play-ws-standalone/src/main/java/play/libs/ws/BodyWritable.java index 7dd5b3bb..178290f8 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/BodyWritable.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/BodyWritable.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; /** diff --git a/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyReadables.java b/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyReadables.java index beefa494..b50586c9 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyReadables.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyReadables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyWritables.java b/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyWritables.java index 4ccce85c..36156ef2 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyWritables.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/DefaultBodyWritables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/DefaultWSCookie.java b/play-ws-standalone/src/main/java/play/libs/ws/DefaultWSCookie.java index 37ba838e..3714d261 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/DefaultWSCookie.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/DefaultWSCookie.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/InMemoryBodyWritable.java b/play-ws-standalone/src/main/java/play/libs/ws/InMemoryBodyWritable.java index 255746b2..9db2615e 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/InMemoryBodyWritable.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/InMemoryBodyWritable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/SourceBodyWritable.java b/play-ws-standalone/src/main/java/play/libs/ws/SourceBodyWritable.java index 1205e7ef..6dc0fa80 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/SourceBodyWritable.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/SourceBodyWritable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.libs.ws; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSClient.java b/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSClient.java index 1f747624..0d40d851 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSClient.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSClient.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; import java.io.IOException; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSRequest.java b/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSRequest.java index 4d19c9d8..c267a86c 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSRequest.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSRequest.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSResponse.java b/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSResponse.java index b968fadd..22678049 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSResponse.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/StandaloneWSResponse.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; import akka.stream.javadsl.Source; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSAuthInfo.java b/play-ws-standalone/src/main/java/play/libs/ws/WSAuthInfo.java index 85b17fe9..3322e3bc 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSAuthInfo.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSAuthInfo.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; /** diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSAuthScheme.java b/play-ws-standalone/src/main/java/play/libs/ws/WSAuthScheme.java index 6c8240b3..2b1360d4 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSAuthScheme.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSAuthScheme.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; public enum WSAuthScheme { diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSBody.java b/play-ws-standalone/src/main/java/play/libs/ws/WSBody.java index 93cbc01f..e4ef31b8 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSBody.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSBody.java @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2009-2019 Lightbend Inc. + */ + package play.libs.ws; import java.util.function.Supplier; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSCookie.java b/play-ws-standalone/src/main/java/play/libs/ws/WSCookie.java index 77407961..bd08946c 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSCookie.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSCookie.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; import java.util.Optional; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSCookieBuilder.java b/play-ws-standalone/src/main/java/play/libs/ws/WSCookieBuilder.java index bac958df..10631cbb 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSCookieBuilder.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSCookieBuilder.java @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2009-2019 Lightbend Inc. + */ + package play.libs.ws; public class WSCookieBuilder { diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSRequestExecutor.java b/play-ws-standalone/src/main/java/play/libs/ws/WSRequestExecutor.java index f1bbf221..083aad2f 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSRequestExecutor.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSRequestExecutor.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; import java.util.concurrent.CompletionStage; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSRequestFilter.java b/play-ws-standalone/src/main/java/play/libs/ws/WSRequestFilter.java index 18b80ba6..87b2d7a0 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSRequestFilter.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSRequestFilter.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; import java.util.function.Function; diff --git a/play-ws-standalone/src/main/java/play/libs/ws/WSSignatureCalculator.java b/play-ws-standalone/src/main/java/play/libs/ws/WSSignatureCalculator.java index 7e3afaee..0674fc2f 100644 --- a/play-ws-standalone/src/main/java/play/libs/ws/WSSignatureCalculator.java +++ b/play-ws-standalone/src/main/java/play/libs/ws/WSSignatureCalculator.java @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.libs.ws; /** diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/Body.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/Body.scala index 903d9056..dcc78c04 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/Body.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/Body.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyReadables.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyReadables.scala index b240b36d..224c73eb 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyReadables.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyReadables.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyWritables.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyWritables.scala index 2fd9696c..744a09e3 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyWritables.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/DefaultBodyWritables.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSClient.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSClient.scala index cc420d52..f8735713 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSClient.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSClient.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws import java.io.{ Closeable, IOException } diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSRequest.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSRequest.scala index 5c051348..4fae2992 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSRequest.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSRequest.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws import java.net.URI diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSResponse.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSResponse.scala index d31188bb..f5a0dccf 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSResponse.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/StandaloneWSResponse.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws import akka.stream.scaladsl.Source diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/WS.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/WS.scala index 9f2b0819..8d2dd93c 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/WS.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/WS.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSClientConfig.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSClientConfig.scala index 6b001810..82078a23 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSClientConfig.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSClientConfig.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws import com.typesafe.sslconfig.ssl.SSLConfigSettings diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala index f15a4370..64243dac 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSConfigParser.scala @@ -1,6 +1,5 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. - * + * Copyright (C) 2009-2019 Lightbend Inc. */ package play.api.libs.ws diff --git a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSRequestFilter.scala b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSRequestFilter.scala index c596608e..64d76aaa 100644 --- a/play-ws-standalone/src/main/scala/play/api/libs/ws/WSRequestFilter.scala +++ b/play-ws-standalone/src/main/scala/play/api/libs/ws/WSRequestFilter.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2017 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws import scala.concurrent.Future diff --git a/play-ws-standalone/src/test/scala/play/api/libs/ws/WSConfigParserSpec.scala b/play-ws-standalone/src/test/scala/play/api/libs/ws/WSConfigParserSpec.scala index ab27d826..b93dda75 100644 --- a/play-ws-standalone/src/test/scala/play/api/libs/ws/WSConfigParserSpec.scala +++ b/play-ws-standalone/src/test/scala/play/api/libs/ws/WSConfigParserSpec.scala @@ -1,6 +1,7 @@ /* - * Copyright (C) 2009-2016 Lightbend Inc. + * Copyright (C) 2009-2019 Lightbend Inc. */ + package play.api.libs.ws import org.specs2.mutable._ diff --git a/project/plugins.sbt b/project/plugins.sbt index 688f0d8a..9f676635 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) resolvers += Resolver.typesafeRepo("releases") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") + addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8") @@ -14,3 +15,5 @@ addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18") addSbtPlugin("com.gilt" % "sbt-dependency-graph-sugar" % "0.9.0") + +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0") \ No newline at end of file