Skip to content

Commit 2ff7eec

Browse files
mduesterhoeftmduesterhoeft
committed
Rename package to moia
1 parent 89ccb3a commit 2ff7eec

File tree

24 files changed

+119
-72
lines changed

24 files changed

+119
-72
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
[![](https://jitpack.io/v/mduesterhoeft/lambda-kotlin-request-router.svg)](https://jitpack.io/#mduesterhoeft/lambda-kotlin-request-router)
1+
[![](https://jitpack.io/v/moia-dev/lambda-kotlin-request-router.svg)](https://jitpack.io/#moia-dev/lambda-kotlin-request-router)
22

33
# lambda-kotlin-request-router
4+
5+
A REST request routing layer for AWS lambda handlers written in Kotlin.

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id("org.jmailen.kotlinter") version "1.22.0"
1515
}
1616

17-
group = "com.github.mduesterhoeft"
17+
group = "com.github.moia-dev"
1818
version = "1.0-SNAPSHOT"
1919

2020
repositories {

‎router-openapi-request-validator/src/main/kotlin/com/github/mduesterhoeft/router/openapi/OpenApiValidator.kt‎ renamed to ‎router-openapi-request-validator/src/main/kotlin/io/moia/router/openapi/OpenApiValidator.kt‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.mduesterhoeft.router.openapi
1+
package io.moia.router.openapi
22

33
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
44
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent
@@ -19,14 +19,22 @@ class OpenApiValidator(val specUrlOrPayload: String) {
1919
}
2020

2121
fun assertValid(request: APIGatewayProxyRequestEvent, response: APIGatewayProxyResponseEvent) {
22-
return validate(request, response).let { if (it.hasErrors()) throw ApiInteractionInvalid(specUrlOrPayload, request, response, it) }
22+
return validate(request, response).let { if (it.hasErrors()) throw ApiInteractionInvalid(
23+
specUrlOrPayload,
24+
request,
25+
response,
26+
it
27+
)
28+
}
2329
}
2430

2531
fun assertValidRequest(request: APIGatewayProxyRequestEvent) =
2632
validator.validateRequest(request.toRequest()).let { if (it.hasErrors()) throw ApiInteractionInvalid(
2733
spec = specUrlOrPayload,
2834
request = request,
29-
validationReport = it) }
35+
validationReport = it
36+
)
37+
}
3038

3139
fun assertValidResponse(request: APIGatewayProxyRequestEvent, response: APIGatewayProxyResponseEvent) =
3240
request.toRequest().let { r ->

‎router-openapi-request-validator/src/test/kotlin/com/github/mduesterhoeft/router/openapi/OpenApiValidatorTest.kt‎ renamed to ‎router-openapi-request-validator/src/test/kotlin/io/moia/router/openapi/OpenApiValidatorTest.kt‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.github.mduesterhoeft.router.openapi
1+
package io.moia.router.openapi
22

3-
import com.github.mduesterhoeft.router.GET
4-
import com.github.mduesterhoeft.router.Request
5-
import com.github.mduesterhoeft.router.RequestHandler
6-
import com.github.mduesterhoeft.router.ResponseEntity
7-
import com.github.mduesterhoeft.router.Router
3+
import io.moia.router.GET
4+
import io.moia.router.Request
5+
import io.moia.router.RequestHandler
6+
import io.moia.router.ResponseEntity
7+
import io.moia.router.Router
88
import io.mockk.mockk
99
import org.assertj.core.api.BDDAssertions.thenThrownBy
1010
import org.junit.jupiter.api.Test
@@ -43,7 +43,8 @@ class OpenApiValidatorTest {
4343
val request = GET("/tests")
4444
.withHeaders(mapOf("Accept" to "application/json"))
4545

46-
val response = TestInvalidRequestHandler().handleRequest(request, mockk())
46+
val response = TestInvalidRequestHandler()
47+
.handleRequest(request, mockk())
4748

4849
thenThrownBy { validator.assertValid(request, response) }.isInstanceOf(OpenApiValidator.ApiInteractionInvalid::class.java)
4950
}
@@ -68,7 +69,11 @@ class OpenApiValidatorTest {
6869

6970
override val router = Router.router {
7071
GET("/tests") { _: Request<Unit> ->
71-
ResponseEntity.ok(TestResponseInvalid("Hello"))
72+
ResponseEntity.ok(
73+
TestResponseInvalid(
74+
"Hello"
75+
)
76+
)
7277
}
7378
}
7479
}

‎router-protobuf/src/main/kotlin/com/github/mduesterhoeft/router/proto/ProtoBufUtils.kt‎ renamed to ‎router-protobuf/src/main/kotlin/io/moia/router/proto/ProtoBufUtils.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.mduesterhoeft.router.proto
1+
package io.moia.router.proto
22

33
import com.fasterxml.jackson.databind.JsonNode
44
import com.fasterxml.jackson.databind.node.ArrayNode
@@ -14,19 +14,19 @@ object ProtoBufUtils {
1414
}
1515

1616
fun removeWrapperObjects(json: String): String {
17-
return ProtoBufUtils.removeWrapperObjects(
17+
return removeWrapperObjects(
1818
jacksonObjectMapper().readTree(json)
1919
).toString()
2020
}
2121

2222
fun removeWrapperObjects(json: JsonNode): JsonNode {
2323
if (json.isArray) {
24-
return ProtoBufUtils.removeWrapperObjects(json as ArrayNode)
24+
return removeWrapperObjects(json as ArrayNode)
2525
} else if (json.isObject) {
2626
if (json.has("value") && json.size() == 1) {
2727
return json.get("value")
2828
}
29-
return ProtoBufUtils.removeWrapperObjects(json as ObjectNode)
29+
return removeWrapperObjects(json as ObjectNode)
3030
}
3131
return json
3232
}
@@ -37,7 +37,7 @@ object ProtoBufUtils {
3737
if (entry.value.isContainerNode) {
3838
if (entry.value.size() > 0) {
3939
result.set(entry.key,
40-
ProtoBufUtils.removeWrapperObjects(entry.value)
40+
removeWrapperObjects(entry.value)
4141
)
4242
} else {
4343
result.set(entry.key, jacksonObjectMapper().nodeFactory.nullNode())
@@ -52,7 +52,7 @@ object ProtoBufUtils {
5252
private fun removeWrapperObjects(json: ArrayNode): ArrayNode {
5353
val result = jacksonObjectMapper().createArrayNode()
5454
for (entry in json) {
55-
result.add(ProtoBufUtils.removeWrapperObjects(entry))
55+
result.add(removeWrapperObjects(entry))
5656
}
5757
return result
5858
}

‎router-protobuf/src/main/kotlin/com/github/mduesterhoeft/router/proto/ProtoDeserializationHandler.kt‎ renamed to ‎router-protobuf/src/main/kotlin/io/moia/router/proto/ProtoDeserializationHandler.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.github.mduesterhoeft.router.proto
1+
package io.moia.router.proto
22

33
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
4-
import com.github.mduesterhoeft.router.DeserializationHandler
5-
import com.github.mduesterhoeft.router.contentType
4+
import io.moia.router.DeserializationHandler
5+
import io.moia.router.contentType
66
import com.google.common.net.MediaType
77
import com.google.protobuf.Parser
88
import java.util.Base64

‎router-protobuf/src/main/kotlin/com/github/mduesterhoeft/router/proto/ProtoEnabledRequestHandler.kt‎ renamed to ‎router-protobuf/src/main/kotlin/io/moia/router/proto/ProtoEnabledRequestHandler.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.github.mduesterhoeft.router.proto
1+
package io.moia.router.proto
22

3-
import com.github.mduesterhoeft.router.JsonDeserializationHandler
4-
import com.github.mduesterhoeft.router.JsonSerializationHandler
5-
import com.github.mduesterhoeft.router.RequestHandler
3+
import io.moia.router.JsonDeserializationHandler
4+
import io.moia.router.JsonSerializationHandler
5+
import io.moia.router.RequestHandler
66

77
abstract class ProtoEnabledRequestHandler : RequestHandler() {
88

‎router-protobuf/src/main/kotlin/com/github/mduesterhoeft/router/proto/ProtoSerializationHandler.kt‎ renamed to ‎router-protobuf/src/main/kotlin/io/moia/router/proto/ProtoSerializationHandler.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.github.mduesterhoeft.router.proto
1+
package io.moia.router.proto
22

3-
import com.github.mduesterhoeft.router.ResponseEntity
4-
import com.github.mduesterhoeft.router.SerializationHandler
3+
import io.moia.router.ResponseEntity
4+
import io.moia.router.SerializationHandler
55
import com.google.common.net.MediaType
66
import com.google.protobuf.GeneratedMessageV3
77
import java.util.Base64

‎router-protobuf/src/test/kotlin/com/github/mduesterhoeft/router/proto/RequestHandlerTest.kt‎ renamed to ‎router-protobuf/src/test/kotlin/io/moia/router/proto/RequestHandlerTest.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.github.mduesterhoeft.router.proto
1+
package io.moia.router.proto
22

33
import assertk.assert
44
import assertk.assertions.isEqualTo
55
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
6-
import com.github.mduesterhoeft.router.Request
7-
import com.github.mduesterhoeft.router.ResponseEntity
8-
import com.github.mduesterhoeft.router.Router.Companion.router
9-
import com.github.mduesterhoeft.router.bodyAsBytes
6+
import io.moia.router.Request
7+
import io.moia.router.ResponseEntity
8+
import io.moia.router.Router.Companion.router
9+
import io.moia.router.bodyAsBytes
1010
import io.mockk.mockk
1111
import org.junit.jupiter.api.Test
1212
import com.github.mduesterhoeft.router.proto.sample.SampleOuterClass.Sample
@@ -24,7 +24,7 @@ class RequestHandlerTest {
2424
.withPath("/some-proto")
2525
.withHttpMethod("GET")
2626
.withHeaders(mapOf("Accept" to "application/json")), mockk()
27-
)!!
27+
)
2828

2929
assert(response.statusCode).isEqualTo(200)
3030
assert(response.body).isEqualTo("""{"hello":"Hello","request":""}""")
@@ -38,7 +38,7 @@ class RequestHandlerTest {
3838
.withPath("/some-proto")
3939
.withHttpMethod("GET")
4040
.withHeaders(mapOf("Accept" to "application/x-protobuf")), mockk()
41-
)!!
41+
)
4242

4343
assert(response.statusCode).isEqualTo(200)
4444
assert(Sample.parseFrom(response.bodyAsBytes())).isEqualTo(Sample.newBuilder().setHello("Hello").setRequest("").build())
@@ -58,7 +58,7 @@ class RequestHandlerTest {
5858
"Accept" to "application/x-protobuf",
5959
"Content-Type" to "application/x-protobuf"
6060
)), mockk()
61-
)!!
61+
)
6262

6363
assert(response.statusCode).isEqualTo(200)
6464
assert(Sample.parseFrom(response.bodyAsBytes())).isEqualTo(request)

‎router/src/main/kotlin/com/github/mduesterhoeft/router/APIGatewayProxyEventExtensions.kt‎ renamed to ‎router/src/main/kotlin/io/moia/router/APIGatewayProxyEventExtensions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.mduesterhoeft.router
1+
package io.moia.router
22

33
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
44
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent

0 commit comments

Comments
 (0)