naijun0403/kompendium
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

chore: clean up some bad habits

Browse Source
This commit is contained in:
Ryan Brink
2022-08-16 19:11:42 -06:00
parent 3326f10576
commit db696309c8
11 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/DeleteInfo.kt
View File

@ -25,11 +25,11 @@ class DeleteInfo private constructor(
class Builder : MethodInfo.Builder<DeleteInfo>() {
override fun build() = DeleteInfo(
response = response!!,
response = response ?: error("Response info must be present"),
errors = errors,
tags = tags,
summary = summary!!,
description = description!!,
summary = summary ?: error("Summary must be present"),
description = description ?: error("Description must be present"),
externalDocumentation = externalDocumentation,
operationId = operationId,
deprecated = deprecated,

6
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/HeadInfo.kt
View File

@ -25,11 +25,11 @@ class HeadInfo private constructor(
class Builder : MethodInfo.Builder<HeadInfo>() {
override fun build() = HeadInfo(
response = response!!,
response = response ?: error("Response info must be present"),
errors = errors,
tags = tags,
summary = summary!!,
description = description!!,
summary = summary ?: error("Summary must be present"),
description = description ?: error("Description must be present"),
externalDocumentation = externalDocumentation,
operationId = operationId,
deprecated = deprecated,

6
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/OptionsInfo.kt
View File

@ -25,11 +25,11 @@ class OptionsInfo private constructor(
class Builder : MethodInfo.Builder<OptionsInfo>() {
override fun build() = OptionsInfo(
response = response!!,
response = response ?: error("Response info must be provided!"),
errors = errors,
tags = tags,
summary = summary!!,
description = description!!,
summary = summary ?: error("Summary must be provided!"),
description = description ?: error("Description must be provided!"),
externalDocumentation = externalDocumentation,
operationId = operationId,
deprecated = deprecated,

8
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/PatchInfo.kt
View File

@ -26,12 +26,12 @@ class PatchInfo private constructor(
class Builder : MethodInfoWithRequest.Builder<PatchInfo>() {
override fun build() = PatchInfo(
request = request!!,
request = request ?: error("request info must be present"),
errors = errors,
response = response!!,
response = response ?: error("response info must be present"),
tags = tags,
summary = summary!!,
description = description!!,
summary = summary ?: error("Summary must be present"),
description = description ?: error("Description must be present"),
externalDocumentation = externalDocumentation,
operationId = operationId,
deprecated = deprecated,

8
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/PostInfo.kt
View File

@ -26,12 +26,12 @@ class PostInfo private constructor(
class Builder : MethodInfoWithRequest.Builder<PostInfo>() {
override fun build() = PostInfo(
request = request!!,
request = request ?: error("request info must be present"),
errors = errors,
response = response!!,
response = response ?: error("response info must be present"),
tags = tags,
summary = summary!!,
description = description!!,
summary = summary ?: error("Summary must be present"),
description = description ?: error("Description must be present"),
externalDocumentation = externalDocumentation,
operationId = operationId,
deprecated = deprecated,

8
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/PutInfo.kt
View File

@ -26,12 +26,12 @@ class PutInfo private constructor(
class Builder : MethodInfoWithRequest.Builder<PutInfo>() {
override fun build() = PutInfo(
request = request!!,
request = request ?: error("request info must be present"),
errors = errors,
response = response!!,
response = response ?: error("response info must be present"),
tags = tags,
summary = summary!!,
description = description!!,
summary = summary ?: error("Summary must be present"),
description = description ?: error("Description must be present"),
externalDocumentation = externalDocumentation,
operationId = operationId,
deprecated = deprecated,

4
core/src/main/kotlin/io/bkbn/kompendium/core/metadata/RequestInfo.kt
View File

@ -37,8 +37,8 @@ class RequestInfo private constructor(
}
fun build() = RequestInfo(
requestType = requestType!!,
description = description!!,
requestType = requestType ?: error("Request type must be present"),
description = description ?: error("Description must be present"),
examples = examples
)
}

3
core/src/main/kotlin/io/bkbn/kompendium/core/plugin/NotarizedRoute.kt
View File

@ -55,7 +55,8 @@ object NotarizedRoute {
Please make sure that all notarized paths are unique
""".trimIndent()
}
spec.paths[routePath] = pluginConfig.path!!
spec.paths[routePath] = pluginConfig.path
?: error("This indicates a bug in Kompendium. Please file a GitHub issue!")
}
val spec = application.attributes[KompendiumAttributes.openApiSpec]

3
json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/CollectionHandler.kt
View File

@ -14,7 +14,8 @@ import kotlin.reflect.KType
object CollectionHandler {
fun handle(type: KType, cache: MutableMap<String, JsonSchema>): JsonSchema {
val collectionType = type.arguments.first().type!!
val collectionType = type.arguments.first().type
?: error("This indicates a bug in Kompendium, please open a GitHub issue!")
val typeSchema = SchemaGenerator.fromTypeToSchema(collectionType, cache).let {
if (it is TypeDefinition && it.type == "object") {
cache[collectionType.getSimpleSlug()] = it

4
json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/MapHandler.kt
View File

@ -15,10 +15,10 @@ import kotlin.reflect.KType
object MapHandler {
fun handle(type: KType, cache: MutableMap<String, JsonSchema>): JsonSchema {
require(type.arguments.first().type!!.classifier as KClass<*> == String::class) {
require(type.arguments.first().type?.classifier as KClass<*> == String::class) {
"JSON requires that map keys MUST be Strings. You provided ${type.arguments.first().type}"
}
val valueType = type.arguments[1].type!!
val valueType = type.arguments[1].type ?: error("this indicates a bug in Kompendium, please open a GitHub issue")
val valueSchema = SchemaGenerator.fromTypeToSchema(valueType, cache).let {
if (it is TypeDefinition && it.type == "object") {
cache[valueType.getSimpleSlug()] = it

3
json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/SimpleObjectHandler.kt
View File

@ -92,7 +92,8 @@ object SimpleObjectHandler {
typeMap: Map<KTypeParameter, KTypeProjection>,
cache: MutableMap<String, JsonSchema>
): JsonSchema {
val type = typeMap[prop.returnType.classifier]?.type!!
val type = typeMap[prop.returnType.classifier]?.type
?: error("This indicates a bug in Kompendium, please open a GitHub issue")
return SchemaGenerator.fromTypeToSchema(type, cache).let {
if (it.isOrContainsObjectDef()) {
cache[type.getSimpleSlug()] = it