From c724cadc227b9f0102d9cd9103127aefbfbb4952 Mon Sep 17 00:00:00 2001 From: tangcent Date: Sun, 18 Jun 2023 12:39:03 +0800 Subject: [PATCH] amend: modify several parameters in RequestRuleWrap nullable --- .../plugin/api/export/core/RequestBuilderListener.kt | 10 +++++----- .../idea/plugin/api/export/rule/RequestRuleWrap.kt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/core/RequestBuilderListener.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/core/RequestBuilderListener.kt index 4f63f5c08..a2fd21a1b 100644 --- a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/core/RequestBuilderListener.kt +++ b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/core/RequestBuilderListener.kt @@ -201,7 +201,7 @@ fun RequestBuilderListener.addFormFileParam( fun RequestBuilderListener.addHeader( exportContext: ExportContext, request: Request, - name: String, value: String, + name: String, value: String?, ): Header { val header = Header() header.name = name @@ -216,7 +216,7 @@ fun RequestBuilderListener.addHeader( fun RequestBuilderListener.addHeaderIfMissed( exportContext: ExportContext, request: Request, - name: String, value: String, + name: String, value: String?, ): Boolean { if (request.header(name) != null) { return false @@ -230,7 +230,7 @@ fun RequestBuilderListener.addHeaderIfMissed( fun RequestBuilderListener.addPathParam( exportContext: ExportContext, request: Request, - name: String, desc: String, + name: String, desc: String?, ) { val pathParam = PathParam() pathParam.name = name @@ -243,7 +243,7 @@ fun RequestBuilderListener.addPathParam( fun RequestBuilderListener.addPathParam( exportContext: ExportContext, request: Request, - name: String, value: String, desc: String?, + name: String, value: String?, desc: String?, ) { val pathParam = PathParam() pathParam.name = name @@ -259,7 +259,7 @@ fun RequestBuilderListener.addResponseHeader( exportContext: ExportContext, response: Response, name: String, - value: String, + value: String?, ) { val header = Header() header.name = name diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/rule/RequestRuleWrap.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/rule/RequestRuleWrap.kt index a1aeda9a1..1aa769a95 100644 --- a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/rule/RequestRuleWrap.kt +++ b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/rule/RequestRuleWrap.kt @@ -266,11 +266,11 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri this.request.headers?.removeIf { it.name == name } } - fun addHeader(name: String, value: String) { + fun addHeader(name: String, value: String?) { requestBuilderListener.addHeader(methodExportContext!!, request, name, value) } - fun addHeaderIfMissed(name: String, value: String): Boolean { + fun addHeaderIfMissed(name: String, value: String?): Boolean { return requestBuilderListener.addHeaderIfMissed(methodExportContext!!, request, name, value) } @@ -294,11 +294,11 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri } } - fun addPathParam(name: String, desc: String) { + fun addPathParam(name: String, desc: String?) { requestBuilderListener.addPathParam(methodExportContext!!, request, name, desc) } - fun addPathParam(name: String, value: String, desc: String) { + fun addPathParam(name: String, value: String?, desc: String?) { val pathParam = PathParam() pathParam.name = name pathParam.value = value @@ -306,7 +306,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri requestBuilderListener.addPathParam(methodExportContext!!, request, pathParam) } - fun setPathParam(name: String, value: String, desc: String) { + fun setPathParam(name: String, value: String?, desc: String?) { val param = request.paths?.firstOrNull { it.name == name } if (param == null) { addPathParam(name, value, desc)