Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
0 parents
commit 1b07da4
Showing
7 changed files
with
181 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
logs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
import sbt._ | ||
import Keys._ | ||
import xerial.sbt.Sonatype._ | ||
import SonatypeKeys._ | ||
import com.typesafe.sbt.pgp.PgpKeys | ||
import sbtrelease._ | ||
import sbtrelease.ReleasePlugin._ | ||
import sbtrelease.ReleasePlugin.ReleaseKeys._ | ||
import sbtrelease.ReleaseStateTransformations._ | ||
|
||
import scala.language.postfixOps | ||
|
||
object ConfigurableNingWSPluginBuild extends Build { | ||
|
||
val playVersion = "2.3.8" | ||
|
||
lazy val plugin = Project( | ||
id = "play-configurable-ningwsplugin", | ||
base = file("."), | ||
settings = Seq( | ||
organization := "com.github.cb372", | ||
scalaVersion := "2.11.5", | ||
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature"), | ||
resolvers += Resolver.typesafeRepo("releases"), | ||
libraryDependencies ++= Seq( | ||
"com.typesafe.play" %% "play-ws" % playVersion % Provided, | ||
"com.typesafe.play" %% "play-test" % playVersion % Test, | ||
"com.typesafe.play" %% "play-test" % playVersion % Test, | ||
"org.scalatestplus" %% "play" % "1.2.0" % Test | ||
), | ||
publishArtifactsAction := PgpKeys.publishSigned.value, | ||
ReleaseKeys.releaseProcess := Seq[ReleaseStep]( | ||
checkSnapshotDependencies, | ||
inquireVersions, | ||
runClean, | ||
runTest, | ||
setReleaseVersion, | ||
commitReleaseVersion, | ||
tagRelease, | ||
publishArtifacts, | ||
setNextVersion, | ||
commitNextVersion, | ||
pushChanges, | ||
deployToMavenCentral | ||
) | ||
) ++ | ||
releaseSettings ++ | ||
mavenSettings | ||
) | ||
|
||
lazy val mavenSettings = Seq( | ||
pomExtra := | ||
<url>https://github.com/cb372/play-configurable-ningwsplugin</url> | ||
<licenses> | ||
<license> | ||
<name>Apache License, Version 2.0</name> | ||
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> | ||
<distribution>repo</distribution> | ||
</license> | ||
</licenses> | ||
<scm> | ||
<url>git@github.com:cb372/play-configurable-ningwsplugin.git</url> | ||
<connection>scm:git:git@github.com:cb372/play-configurable-ningwsplugin.git</connection> | ||
</scm> | ||
<developers> | ||
<developer> | ||
<id>cb372</id> | ||
<name>Chris Birchall</name> | ||
<url>https://github.com/cb372</url> | ||
</developer> | ||
</developers>, | ||
publishTo <<= version { v => | ||
val nexus = "https://oss.sonatype.org/" | ||
if (v.trim.endsWith("SNAPSHOT")) | ||
Some("snapshots" at nexus + "content/repositories/snapshots") | ||
else | ||
Some("releases" at nexus + "service/local/staging/deploy/maven2") | ||
}, | ||
publishMavenStyle := true, | ||
publishArtifact in Test := false, | ||
pomIncludeRepository := { _ => false } | ||
) | ||
|
||
lazy val deployToMavenCentral = ReleaseStep(action = releaseTask(sonatypeReleaseAll)) | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
sbt.version=0.13.7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1") | ||
|
||
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1") | ||
|
||
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5") |
59 changes: 59 additions & 0 deletions
59
src/main/scala/play/plugins/ConfigurableNingWSPlugin.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
package play.plugins | ||
|
||
import com.ning.http.client.AsyncHttpClientConfig | ||
import play.api.{Configuration, Application} | ||
import play.api.libs.ws.ning.{NingAsyncHttpClientConfigBuilder, NingWSAPI} | ||
import play.api.libs.ws.{WSClientConfig, DefaultWSConfigParser, WSPlugin} | ||
|
||
/** | ||
* A modified version of play.api.libs.ws.ning.NingWSPlugin | ||
* that allows us to customise the AsyncHttpClient configuration. | ||
*/ | ||
class ConfigurableNingWSPlugin(app: Application) extends WSPlugin { | ||
|
||
@volatile var loaded = false | ||
|
||
override lazy val enabled = true | ||
|
||
private val config = new DefaultWSConfigParser(app.configuration, app.classloader).parse() | ||
|
||
private lazy val ningAPI = new ConfigurableNingWSAPI(app, config) | ||
|
||
override def onStart() { | ||
loaded = true | ||
} | ||
|
||
override def onStop() { | ||
if (loaded) { | ||
ningAPI.resetClient() | ||
loaded = false | ||
} | ||
} | ||
|
||
def api = ningAPI | ||
|
||
} | ||
|
||
/** | ||
* A modified version of play.api.libs.ws.ning.NingWSAPI | ||
* that allows us to customise the AsyncHttpClient configuration. | ||
* | ||
* Note: This class has to be inside the play package because | ||
* `NingWSAPI` includes some `private[play]` members. | ||
*/ | ||
class ConfigurableNingWSAPI(app: Application, clientConfig: WSClientConfig) extends NingWSAPI(app, clientConfig) { | ||
|
||
override def buildAsyncClientConfig(wsClientConfig: WSClientConfig): AsyncHttpClientConfig = { | ||
val ahcConfigBuilder = createAndConfigureAHCConfigBuilder(app.configuration) | ||
new NingAsyncHttpClientConfigBuilder(wsClientConfig, ahcConfigBuilder).build() | ||
} | ||
|
||
private def createAndConfigureAHCConfigBuilder(config: Configuration) = { | ||
val builder = new AsyncHttpClientConfig.Builder() | ||
config.getInt("ws.ning.maximumConnectionLifeTime").foreach(builder.setMaxConnectionLifeTimeInMs) | ||
config.getInt("ws.ning.idleConnectionInPoolTimeout").foreach(builder.setIdleConnectionInPoolTimeoutInMs) | ||
config.getInt("ws.ning.webSocketIdleTimeout").foreach(builder.setWebSocketIdleTimeoutInMs) | ||
builder | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package play.plugins | ||
|
||
import com.ning.http.client.AsyncHttpClient | ||
import org.scalatest._ | ||
import org.scalatestplus.play._ | ||
import play.api.libs.ws.WS | ||
import play.api.test.FakeApplication | ||
|
||
class PluginSpec extends FlatSpec with Matchers with OneAppPerSuite { | ||
|
||
override implicit lazy val app = new FakeApplication( | ||
additionalPlugins = Seq("play.plugins.ConfigurableNingWSPlugin"), | ||
additionalConfiguration = Map( | ||
"ws.ning.maximumConnectionLifeTime" -> 100, | ||
"ws.ning.idleConnectionInPoolTimeout" -> 200, | ||
"ws.ning.webSocketIdleTimeout" -> 300 | ||
) | ||
) | ||
|
||
"App with plugin installed" should "have a properly configured AsyncHttpClient" in { | ||
val config = WS.client.underlying[AsyncHttpClient].getConfig | ||
config.getMaxConnectionLifeTimeInMs should be(100) | ||
config.getIdleConnectionInPoolTimeoutInMs should be(200) | ||
config.getWebSocketIdleTimeoutInMs should be(300) | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
version in ThisBuild := "0.1-SNAPSHOT" |