Skip to content

Commit 24decd8

Browse files
committed
add deprecated to await method #58
1 parent b3c06a4 commit 24decd8

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,6 @@ object OAuth2Controller extends Controller with OAuth2Provider {
128128
}
129129
```
130130

131-
NOTE: If your controller supports returning synchronous result, use ```await``` method which is package object of scalaoauth2.provider.
132-
133-
```scala
134-
import scalaoauth2.provider._
135-
object OAuth2Controller extends Controller with OAuth2Provider {
136-
def accessToken = Action { implicit request =>
137-
await(issueAccessToken(new MyDataHandler()))
138-
}
139-
}
140-
```
141-
142131
Then, assign a route to the controller that OAuth clients will access to.
143132

144133
```

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/package.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ package object provider {
4242
* @param timeout maximum wait time
4343
* @return Await and return the result.
4444
*/
45+
@deprecated("Use Await in your own", "0.13.0")
4546
def await(f: Future[Result], timeout: Duration = 60.seconds): Result = Await.result(f, timeout)
4647

4748
}

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Keys._
44
object ScalaOAuth2Build extends Build {
55

66
lazy val _organization = "com.nulab-inc"
7-
lazy val _version = "0.13.0"
7+
lazy val _version = "0.13.1-SNAPSHOT"
88
lazy val _playVersion = "2.3.7"
99

1010
val _scalaVersion = "2.10.5"

0 commit comments

Comments
 (0)