Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Koin extensions on Routing and Route classes #159

Merged
merged 1 commit into from
Jul 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import io.ktor.application.install
import io.ktor.features.CallLogging
import io.ktor.features.DefaultHeaders
import io.ktor.response.respondText
import io.ktor.routing.Route
import io.ktor.routing.Routing
import io.ktor.routing.get
import io.ktor.routing.routing
import io.ktor.server.engine.commandLineEnvironment
Expand Down Expand Up @@ -41,6 +43,30 @@ fun Application.main() {
get("/hello") {
call.respondText(service.sayHello())
}

v1()
}
}

fun Routing.v1() {

// Lazy inject HelloService from within a Ktor Routing Node
val service by inject<HelloService>()

get("/v1/hello") {
call.respondText("[/v1/hello] " + service.sayHello())
}

bye()
}

fun Route.bye() {

// Lazy inject HelloService from within a Ktor Route
val service by inject<HelloService>()

get("/v1/bye") {
call.respondText("[/v1/bye] " + service.sayHello())
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,29 @@ class ApplicationJobRoutesTest : AutoCloseKoinTest() {
assertFalse(requestHandled)
}
}

@Test
fun testV1HelloRequest() = withTestApplication(Application::main) {
with(handleRequest(HttpMethod.Get, "/v1/hello")) {
assertEquals(HttpStatusCode.OK, response.status())
assertEquals("[/v1/hello] Hello Ktor & Koin !", response.content)
}

with(handleRequest(HttpMethod.Get, "/index.html")) {
assertFalse(requestHandled)
}
}


@Test
fun testV1ByeRequest() = withTestApplication(Application::main) {
with(handleRequest(HttpMethod.Get, "/v1/bye")) {
assertEquals(HttpStatusCode.OK, response.status())
assertEquals("[/v1/bye] Hello Ktor & Koin !", response.content)
}

with(handleRequest(HttpMethod.Get, "/index.html")) {
assertFalse(requestHandled)
}
}
}
57 changes: 57 additions & 0 deletions koin-projects/koin-ktor/src/docs/asciidoc/features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,66 @@ fun Application.main() {
}
----

From `Routing` class:

[source,kotlin]
----
fun Application.main() {
//...

// Lazy inject HelloService
val service by inject<HelloService>()

// Routing section
routing {
v1()
}
}

fun Routing.v1() {

// Lazy inject HelloService from within a Ktor Routing Node
val service by inject<HelloService>()

get("/v1/hello") {
call.respondText("[/v1/hello] " + service.sayHello())
}
}

----


From `Route` class:

[source,kotlin]
----
fun Application.main() {
//...

// Lazy inject HelloService
val service by inject<HelloService>()

// Routing section
routing {
v1()
}
}

fun Routing.v1() {
hello()
}

fun Route.hello() {

// Lazy inject HelloService from within a Ktor Route
val service by inject<HelloService>()

get("/v1/bye") {
call.respondText("[/v1/bye] " + service.sayHello())
}
}

----



Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/*
* Copyright 2017-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.koin.ktor.ext

import io.ktor.routing.Route
import org.koin.core.KoinContext
import org.koin.core.parameter.ParameterDefinition
import org.koin.core.parameter.emptyParameterDefinition
import org.koin.standalone.StandAloneContext


/**
* Ktor Koin extensions for Routing class
*
* @author Arnaud Giuliani
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to add my name. Just yours for now

* @author Laurent Baresse
*/

/**
* inject lazily given dependency
* @param name - bean name / optional
* @param module - module path
* @param parameters
*/
inline fun <reified T> Route.inject(
name: String = "",
module: String? = null,
noinline parameters: ParameterDefinition = emptyParameterDefinition()
) =
lazy { (StandAloneContext.koinContext as KoinContext).get<T>(name, module, parameters) }

/**
* Retrieve given dependency for KoinComponent
* @param name - bean name / optional
* @param module - module path
* @param parameters
*/
inline fun <reified T> Route.get(
name: String = "",
module: String? = null,
noinline parameters: ParameterDefinition = emptyParameterDefinition()
) =
(StandAloneContext.koinContext as KoinContext).get<T>(name, module, parameters)

/**
* lazy inject given property
* @param key - key property
* throw MissingPropertyException if property is not found
*/
inline fun <reified T> Route.property(key: String) =
lazy { (StandAloneContext.koinContext as KoinContext).getProperty<T>(key) }

/**
* lazy inject given property
* give a default value if property is missing
*
* @param key - key property
* @param defaultValue - default value if property is missing
*
*/
inline fun <reified T> Route.property(key: String, defaultValue: T) =
lazy { (StandAloneContext.koinContext as KoinContext).getProperty(key, defaultValue) }

/**
* Retrieve given property for KoinComponent
* @param key - key property
* throw MissingPropertyException if property is not found
*/
inline fun <reified T> Route.getProperty(key: String) =
(StandAloneContext.koinContext as KoinContext).getProperty<T>(key)

/**
* Retrieve given property for KoinComponent
* give a default value if property is missing
*
* @param key - key property
* @param defaultValue - default value if property is missing
*
*/
inline fun <reified T> Route.getProperty(key: String, defaultValue: T) =
(StandAloneContext.koinContext as KoinContext).getProperty(key, defaultValue)


/**
* Help work on ModuleDefinition
*/
private fun context() = (StandAloneContext.koinContext as KoinContext)

/**
* Set property value
*
* @param key - key property
* @param value - property value
*
*/
fun Route.setProperty(key: String, value: Any) = context().setProperty(key, value)
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/*
* Copyright 2017-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.koin.ktor.ext

import io.ktor.routing.Routing
import org.koin.core.KoinContext
import org.koin.core.parameter.ParameterDefinition
import org.koin.core.parameter.emptyParameterDefinition
import org.koin.standalone.StandAloneContext


/**
* Ktor Koin extensions for Routing class
*
* @author Arnaud Giuliani
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idem, no need to add my name. Just yours for now

* @author Laurent Baresse
*/

/**
* inject lazily given dependency
* @param name - bean name / optional
* @param module - module path
* @param parameters
*/
inline fun <reified T> Routing.inject(
name: String = "",
module: String? = null,
noinline parameters: ParameterDefinition = emptyParameterDefinition()
) =
lazy { (StandAloneContext.koinContext as KoinContext).get<T>(name, module, parameters) }

/**
* Retrieve given dependency for KoinComponent
* @param name - bean name / optional
* @param module - module path
* @param parameters
*/
inline fun <reified T> Routing.get(
name: String = "",
module: String? = null,
noinline parameters: ParameterDefinition = emptyParameterDefinition()
) =
(StandAloneContext.koinContext as KoinContext).get<T>(name, module, parameters)

/**
* lazy inject given property
* @param key - key property
* throw MissingPropertyException if property is not found
*/
inline fun <reified T> Routing.property(key: String) =
lazy { (StandAloneContext.koinContext as KoinContext).getProperty<T>(key) }

/**
* lazy inject given property
* give a default value if property is missing
*
* @param key - key property
* @param defaultValue - default value if property is missing
*
*/
inline fun <reified T> Routing.property(key: String, defaultValue: T) =
lazy { (StandAloneContext.koinContext as KoinContext).getProperty(key, defaultValue) }

/**
* Retrieve given property for KoinComponent
* @param key - key property
* throw MissingPropertyException if property is not found
*/
inline fun <reified T> Routing.getProperty(key: String) =
(StandAloneContext.koinContext as KoinContext).getProperty<T>(key)

/**
* Retrieve given property for KoinComponent
* give a default value if property is missing
*
* @param key - key property
* @param defaultValue - default value if property is missing
*
*/
inline fun <reified T> Routing.getProperty(key: String, defaultValue: T) =
(StandAloneContext.koinContext as KoinContext).getProperty(key, defaultValue)


/**
* Help work on ModuleDefinition
*/
private fun context() = (StandAloneContext.koinContext as KoinContext)

/**
* Set property value
*
* @param key - key property
* @param value - property value
*
*/
fun Routing.setProperty(key: String, value: Any) = context().setProperty(key, value)