-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
- Loading branch information
Showing
7 changed files
with
159 additions
and
4 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
34 changes: 34 additions & 0 deletions
34
...psign/ktor/openapigen/parameters/parsers/builders/query/deepobject/OptionalDeepBuilder.kt
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,34 @@ | ||
package com.papsign.ktor.openapigen.parameters.parsers.builders.query.deepobject | ||
|
||
import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderSelector | ||
import com.papsign.ktor.openapigen.parameters.parsers.converters.Converter | ||
import com.papsign.ktor.openapigen.parameters.parsers.converters.ConverterFactory | ||
import java.util.* | ||
import kotlin.reflect.KType | ||
import kotlin.reflect.full.isSubclassOf | ||
import kotlin.reflect.jvm.jvmErasure | ||
|
||
class OptionalDeepBuilder(type: KType) : DeepBuilder { | ||
private val converter: Converter = ConverterFactory.buildConverterForced(type.arguments[0].type!!) | ||
|
||
override fun build(key: String, parameters: Map<String, List<String>>): Any? { | ||
return parameters[key]?.let { it[0] }?.let { value -> | ||
when (value) { | ||
"" -> Optional.empty() | ||
"null" -> Optional.empty() | ||
else -> Optional.ofNullable(converter.convert(value)) | ||
} | ||
} | ||
} | ||
|
||
|
||
companion object : BuilderSelector<OptionalDeepBuilder> { | ||
override fun canHandle(type: KType, explode: Boolean): Boolean { | ||
return type.jvmErasure.isSubclassOf(Optional::class) | ||
} | ||
|
||
override fun create(type: KType, explode: Boolean): OptionalDeepBuilder { | ||
return OptionalDeepBuilder(type) | ||
} | ||
} | ||
} |
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
32 changes: 32 additions & 0 deletions
32
...lin/com/papsign/ktor/openapigen/parameters/parsers/converters/object/OptionalConverter.kt
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,32 @@ | ||
package com.papsign.ktor.openapigen.parameters.parsers.converters.`object` | ||
|
||
import com.papsign.ktor.openapigen.parameters.parsers.converters.Converter | ||
import com.papsign.ktor.openapigen.parameters.parsers.converters.ConverterFactory | ||
import com.papsign.ktor.openapigen.parameters.parsers.converters.ConverterSelector | ||
import java.util.* | ||
import kotlin.reflect.KType | ||
import kotlin.reflect.full.isSubclassOf | ||
import kotlin.reflect.jvm.jvmErasure | ||
|
||
class OptionalConverter(type: KType) : Converter { | ||
private val converter: Converter = ConverterFactory.buildConverterForced(type.arguments[0].type!!) | ||
|
||
override fun convert(value: String): Any? { | ||
return when (value) { | ||
"" -> Optional.empty() | ||
"null" -> Optional.empty() | ||
else -> Optional.ofNullable(converter.convert(value)) | ||
} | ||
} | ||
|
||
|
||
companion object : ConverterSelector { | ||
override fun canHandle(type: KType): Boolean { | ||
return type.jvmErasure.isSubclassOf(Optional::class) | ||
} | ||
|
||
override fun create(type: KType): OptionalConverter { | ||
return OptionalConverter(type) | ||
} | ||
} | ||
} |
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
39 changes: 39 additions & 0 deletions
39
.../com/papsign/ktor/openapigen/parameters/parsers/builder/query/form/OptionalBuilderTest.kt
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,39 @@ | ||
package com.papsign.ktor.openapigen.parameters.parsers.builder.query.form | ||
|
||
import com.papsign.ktor.openapigen.parameters.parsers.builders.query.form.FormBuilderFactory | ||
import com.papsign.ktor.openapigen.parameters.parsers.testSelector | ||
import org.junit.Test | ||
import java.util.* | ||
|
||
class OptionalBuilderTest { | ||
|
||
@Test | ||
fun testFilledValue() { | ||
val key = "key" | ||
val expected = Optional.of(1) | ||
val parse = mapOf( | ||
key to listOf("1") | ||
) | ||
FormBuilderFactory.testSelector(expected, key, parse, true) | ||
} | ||
|
||
@Test | ||
fun testEmptyValue() { | ||
val key = "key" | ||
val expected = Optional.empty<Int>() | ||
val parse = mapOf( | ||
key to listOf("") | ||
) | ||
FormBuilderFactory.testSelector(expected, key, parse, true) | ||
} | ||
|
||
@Test | ||
fun testExplicitNullValue() { | ||
val key = "key" | ||
val expected = Optional.empty<Int>() | ||
val parse = mapOf( | ||
key to listOf("null") | ||
) | ||
FormBuilderFactory.testSelector(expected, key, parse, true) | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
...psign/ktor/openapigen/parameters/parsers/builders/query/deepobject/OptionalBuilderTest.kt
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,38 @@ | ||
package com.papsign.ktor.openapigen.parameters.parsers.builders.query.deepobject | ||
|
||
import com.papsign.ktor.openapigen.parameters.parsers.testSelector | ||
import org.junit.Test | ||
import java.util.* | ||
|
||
class OptionalBuilderTest { | ||
|
||
@Test | ||
fun testFilledValue() { | ||
val key = "key" | ||
val expected = Optional.of(1) | ||
val parse = mapOf( | ||
key to listOf("1") | ||
) | ||
DeepBuilderFactory.testSelector(expected, key, parse, true) | ||
} | ||
|
||
@Test | ||
fun testEmptyValue() { | ||
val key = "key" | ||
val expected = Optional.empty<Int>() | ||
val parse = mapOf( | ||
key to listOf("") | ||
) | ||
DeepBuilderFactory.testSelector(expected, key, parse, true) | ||
} | ||
|
||
@Test | ||
fun testExplicitNullValue() { | ||
val key = "key" | ||
val expected = Optional.empty<Int>() | ||
val parse = mapOf( | ||
key to listOf("null") | ||
) | ||
DeepBuilderFactory.testSelector(expected, key, parse, true) | ||
} | ||
} |