[kotlin] add option for non public api (#4089)

* [kotlin] add option for non public api

* [kotlin] update petstores

* [kotlin] add missing script to kotlin-client-all.sh

* [kotlin] update pet projects

* [kotlin] remove public modifier

* [kotlin-client] inline visibility modifier

bin/kotlin-client-all.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+./bin/kotlin-client-nonpublic.sh
 ./bin/kotlin-client-okhttp3.sh
 ./bin/kotlin-client-petstore-multiplatform.sh
 ./bin/kotlin-client-petstore.sh

bin/kotlin-client-nonpublic.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=$(ls -ld "$SCRIPT")
+  link=$(expr "$ls" : '.*-> \(.*\)$')
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=$(dirname "$SCRIPT")/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=$(dirname "$SCRIPT")/..
+  APP_DIR=$(cd "${APP_DIR}"; pwd)
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/kotlin-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g kotlin --artifact-id kotlin-petstore-nonpublic --additional-properties nonPublicApi=true -o samples/client/petstore/kotlin-nonpublic $@"
+
+java ${JAVA_OPTS} -jar ${executable} ${ags}
+
+cp CI/samples.ci/client/petstore/kotlin-string/pom.xml samples/client/petstore/kotlin-string/pom.xml

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java

@@ -60,6 +60,8 @@ public enum SERIALIZATION_LIBRARY_TYPE {moshi, gson}
     protected boolean serializableModel = false;
     protected boolean needsDataClassBody = false;
 
+    protected boolean nonPublicApi = false;
+
     protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.camelCase;
     protected SERIALIZATION_LIBRARY_TYPE serializationLibrary = SERIALIZATION_LIBRARY_TYPE.moshi;
 
@@ -442,6 +444,12 @@ public void processOpts() {
             additionalProperties.put(CodegenConstants.PARCELIZE_MODELS, parcelizeModels);
         }
 
+        if (additionalProperties.containsKey(CodegenConstants.NON_PUBLIC_API)) {
+            this.setNonPublicApi(Boolean.valueOf((String) additionalProperties.get(CodegenConstants.NON_PUBLIC_API)));
+        } else {
+            additionalProperties.put(CodegenConstants.NON_PUBLIC_API, nonPublicApi);
+        }
+
         additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage());
         additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage());
 
@@ -492,6 +500,14 @@ public boolean isSerializableModel() {
     public void setSerializableModel(boolean serializableModel) {
         this.serializableModel = serializableModel;
     }
+
+    public boolean nonPublicApi() {
+        return nonPublicApi;
+    }
+
+    public void setNonPublicApi(boolean nonPublicApi) {
+        this.nonPublicApi = nonPublicApi;
+    }
 
     public boolean isNeedsDataClassBody() {
         return needsDataClassBody;

modules/openapi-generator/src/main/resources/kotlin-client/api.mustache

@@ -17,7 +17,7 @@ import {{packageName}}.infrastructure.Success
 import {{packageName}}.infrastructure.toMultiValue
 
 {{#operations}}
-class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(basePath) {
+{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(basePath) {
 
     {{#operation}}
     /**

modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache

@@ -28,7 +28,7 @@ import java.io.Serializable
 @Parcelize
 {{/parcelizeModels}}
 {{#multiplatform}}@Serializable{{/multiplatform}}
-data class {{classname}} (
+{{#nonPublicApi}}internal {{/nonPublicApi}}data class {{classname}} (
 {{#requiredVars}}
 {{>data_class_req_var}}{{^-last}},
 {{/-last}}{{/requiredVars}}{{#hasRequired}}{{#hasOptional}},
@@ -41,7 +41,7 @@ data class {{classname}} (
 {
 {{/vendorExtensions.x-has-data-class-body}}
 {{#serializableModel}}
-	companion object {
+	{{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
 		private const val serialVersionUID: Long = 123
 	}
 {{/serializableModel}}
@@ -53,7 +53,7 @@ data class {{classname}} (
     * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
     */
     {{#multiplatform}}@Serializable(with = {{nameInCamelCase}}.Serializer::class){{/multiplatform}}
-    enum class {{{nameInCamelCase}}}(val value: {{#isListContainer}}{{{ nestedType }}}{{/isListContainer}}{{^isListContainer}}{{{dataType}}}{{/isListContainer}}){
+    {{#nonPublicApi}}internal {{/nonPublicApi}}enum class {{{nameInCamelCase}}}(val value: {{#isListContainer}}{{{ nestedType }}}{{/isListContainer}}{{^isListContainer}}{{{dataType}}}{{/isListContainer}}){
     {{#allowableValues}}
     {{#enumVars}}
         {{#jvm}}
@@ -71,7 +71,7 @@ data class {{classname}} (
     {{/allowableValues}}
     {{#multiplatform}}
 
-        object Serializer : CommonEnumSerializer<{{nameInCamelCase}}>("{{nameInCamelCase}}", values(), values().map { it.value }.toTypedArray())
+        {{#nonPublicApi}}internal {{/nonPublicApi}}object Serializer : CommonEnumSerializer<{{nameInCamelCase}}>("{{nameInCamelCase}}", values(), values().map { it.value }.toTypedArray())
     {{/multiplatform}}
     }
 {{/isEnum}}

modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache

@@ -16,7 +16,7 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
 */
 {{#multiplatform}}@Serializable(with = {{classname}}.Serializer::class){{/multiplatform}}
-enum class {{classname}}(val value: {{{dataType}}}){
+{{#nonPublicApi}}internal {{/nonPublicApi}}enum class {{classname}}(val value: {{{dataType}}}){
 
 {{#allowableValues}}{{#enumVars}}
     {{#jvm}}
@@ -42,6 +42,6 @@ enum class {{classname}}(val value: {{{dataType}}}){
 {{/enumVars}}{{/allowableValues}}
 
 {{#multiplatform}}
-    object Serializer : CommonEnumSerializer<{{classname}}>("{{classname}}", values(), values().map { it.value }.toTypedArray())
+    {{#nonPublicApi}}internal {{/nonPublicApi}}object Serializer : CommonEnumSerializer<{{classname}}>("{{classname}}", values(), values().map { it.value }.toTypedArray())
 {{/multiplatform}}
 }

modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache

@@ -2,20 +2,20 @@ package {{packageName}}.infrastructure
 
 typealias MultiValueMap = Map<String,List<String>>
 
-fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+{{#nonPublicApi}}internal {{/nonPublicApi}}fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
     "csv" -> ","
     "tsv" -> "\t"
     "pipes" -> "|"
     "ssv" -> " "
     else -> ""
 }
 
-val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+{{#nonPublicApi}}internal {{/nonPublicApi}}val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
 
-fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+{{#nonPublicApi}}internal {{/nonPublicApi}}fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
         = toMultiValue(items.asIterable(), collectionFormat, map)
 
-fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+{{#nonPublicApi}}internal {{/nonPublicApi}}fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
     return when(collectionFormat) {
         "multi" -> items.map(map)
         else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))

modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache

@@ -8,7 +8,7 @@ package {{packageName}}.infrastructure
  * NOTE: Headers is a Map<String,String> because rfc2616 defines
  *       multi-valued headers as csv-only.
  */
-data class RequestConfig(
+{{#nonPublicApi}}internal {{/nonPublicApi}}data class RequestConfig(
     val method: RequestMethod,
     val path: String,
     val headers: MutableMap<String, String> = mutableMapOf(),

modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/RequestMethod.kt.mustache

@@ -3,6 +3,6 @@ package {{packageName}}.infrastructure
 /**
  * Provides enumerated HTTP verbs
  */
-enum class RequestMethod {
+{{#nonPublicApi}}internal {{/nonPublicApi}}enum class RequestMethod {
     GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
 }

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApiClient.kt.mustache

@@ -23,8 +23,8 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
 import java.io.File
 
-open class ApiClient(val baseUrl: String) {
-    companion object {
+{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(val baseUrl: String) {
+    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
         protected const val ContentType = "Content-Type"
         protected const val Accept = "Accept"
         protected const val Authorization = "Authorization"

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApiInfrastructureResponse.kt.mustache

@@ -1,38 +1,38 @@
 package {{packageName}}.infrastructure
 
-enum class ResponseType {
+{{#nonPublicApi}}internal {{/nonPublicApi}}enum class ResponseType {
     Success, Informational, Redirection, ClientError, ServerError
 }
 
-abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType) {
+{{#nonPublicApi}}internal {{/nonPublicApi}}abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType) {
     abstract val statusCode: Int
     abstract val headers: Map<String,List<String>>
 }
 
-class Success<T>(
+{{#nonPublicApi}}internal {{/nonPublicApi}}class Success<T>(
     val data: T,
     override val statusCode: Int = -1,
     override val headers: Map<String, List<String>> = mapOf()
 ): ApiInfrastructureResponse<T>(ResponseType.Success)
 
-class Informational<T>(
+{{#nonPublicApi}}internal {{/nonPublicApi}}class Informational<T>(
     val statusText: String,
     override val statusCode: Int = -1,
     override val headers: Map<String, List<String>> = mapOf()
 ) : ApiInfrastructureResponse<T>(ResponseType.Informational)
 
-class Redirection<T>(
+{{#nonPublicApi}}internal {{/nonPublicApi}}class Redirection<T>(
     override val statusCode: Int = -1,
     override val headers: Map<String, List<String>> = mapOf()
 ) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
 
-class ClientError<T>(
+{{#nonPublicApi}}internal {{/nonPublicApi}}class ClientError<T>(
     val body: Any? = null,
     override val statusCode: Int = -1,
     override val headers: Map<String, List<String>> = mapOf()
 ) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
 
-class ServerError<T>(
+{{#nonPublicApi}}internal {{/nonPublicApi}}class ServerError<T>(
     val message: String? = null,
     val body: Any? = null,
     override val statusCode: Int = -1,

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApplicationDelegates.kt.mustache

@@ -3,7 +3,7 @@ package {{packageName}}.infrastructure
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
-object ApplicationDelegates {
+{{#nonPublicApi}}internal {{/nonPublicApi}}object ApplicationDelegates {
     /**
      * Provides a property delegate, allowing the property to be set once and only once.
      *

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ByteArrayAdapter.kt.mustache

@@ -3,7 +3,7 @@ package {{packageName}}.infrastructure
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.ToJson
 
-class ByteArrayAdapter {
+{{#nonPublicApi}}internal {{/nonPublicApi}}class ByteArrayAdapter {
     @ToJson
     fun toJson(data: ByteArray): String = String(data)
 

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/Errors.kt.mustache

@@ -3,7 +3,7 @@ package {{packageName}}.infrastructure
 
 import java.lang.RuntimeException
 
-open class ClientException : RuntimeException {
+{{#nonPublicApi}}internal {{/nonPublicApi}}open class ClientException : RuntimeException {
 
     /**
      * Constructs an [ClientException] with no detail message.
@@ -17,12 +17,12 @@ open class ClientException : RuntimeException {
      */
     constructor(message: kotlin.String) : super(message)
 
-    companion object {
+    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
         private const val serialVersionUID: Long = 123L
     }
 }
 
-open class ServerException : RuntimeException {
+{{#nonPublicApi}}internal {{/nonPublicApi}}open class ServerException : RuntimeException {
 
     /**
      * Constructs an [ServerException] with no detail message.
@@ -36,7 +36,7 @@ open class ServerException : RuntimeException {
      */
     constructor(message: kotlin.String) : super(message)
 
-    companion object {
+    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
         private const val serialVersionUID: Long = 456L
     }
 }

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/LocalDateAdapter.kt.mustache

@@ -11,7 +11,7 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.format.DateTimeFormatter
 {{/threetenbp}}
 
-class LocalDateAdapter {
+{{#nonPublicApi}}internal {{/nonPublicApi}}class LocalDateAdapter {
     @ToJson
     fun toJson(value: LocalDate): String {
         return DateTimeFormatter.ISO_LOCAL_DATE.format(value)

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/LocalDateTimeAdapter.kt.mustache

@@ -11,7 +11,7 @@ import org.threeten.bp.LocalDateTime
 import org.threeten.bp.format.DateTimeFormatter
 {{/threetenbp}}
 
-class LocalDateTimeAdapter {
+{{#nonPublicApi}}internal {{/nonPublicApi}}class LocalDateTimeAdapter {
     @ToJson
     fun toJson(value: LocalDateTime): String {
         return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ResponseExtensions.kt.mustache

@@ -5,19 +5,19 @@ import okhttp3.Response
 /**
  * Provides an extension to evaluation whether the response is a 1xx code
  */
-val Response.isInformational : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 100..199
+{{#nonPublicApi}}internal {{/nonPublicApi}}val Response.isInformational : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 100..199
 
 /**
  * Provides an extension to evaluation whether the response is a 3xx code
  */
-val Response.isRedirect : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 300..399
+{{#nonPublicApi}}internal {{/nonPublicApi}}val Response.isRedirect : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 300..399
 
 /**
  * Provides an extension to evaluation whether the response is a 4xx code
  */
-val Response.isClientError : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 400..499
+{{#nonPublicApi}}internal {{/nonPublicApi}}val Response.isClientError : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 400..499
 
 /**
  * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
  */
-val Response.isServerError : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 500..999
+{{#nonPublicApi}}internal {{/nonPublicApi}}val Response.isServerError : Boolean get() = this.code{{#jvm-okhttp3}}(){{/jvm-okhttp3}} in 500..999

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/Serializer.kt.mustache

@@ -5,7 +5,7 @@ import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import java.util.Date
 
-object Serializer {
+{{#nonPublicApi}}internal {{/nonPublicApi}}object Serializer {
     @JvmStatic
     val moshi: Moshi = Moshi.Builder()
         .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe())

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/UUIDAdapter.kt.mustache

@@ -4,7 +4,7 @@ import com.squareup.moshi.FromJson
 import com.squareup.moshi.ToJson
 import java.util.UUID
 
-class UUIDAdapter {
+{{#nonPublicApi}}internal {{/nonPublicApi}}class UUIDAdapter {
     @ToJson
     fun toJson(uuid: UUID) = uuid.toString()
 

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache

@@ -16,7 +16,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 {{#operations}}
-class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
+{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
         baseUrl: kotlin.String = "{{{basePath}}}",
         httpClientEngine: HttpClientEngine? = null,
         serializer: KotlinxSerializer)
@@ -101,7 +101,7 @@ class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
 
     {{/operation}}
 
-    companion object {
+    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
         internal fun setMappers(serializer: KotlinxSerializer) {
             {{#operation}}
             {{#hasBodyParam}}

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache

@@ -24,7 +24,7 @@ import kotlinx.serialization.json.JsonConfiguration
 import {{apiPackage}}.*
 import {{modelPackage}}.*
 
-open class ApiClient(
+{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(
         private val baseUrl: String,
         httpClientEngine: HttpClientEngine?,
         serializer: KotlinxSerializer) {
@@ -46,7 +46,7 @@ open class ApiClient(
         httpClientEngine?.let { HttpClient(it, clientConfig) } ?: HttpClient(clientConfig)
     }
 
-    companion object {
+    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
         protected val UNSAFE_HEADERS = listOf(HttpHeaders.ContentType)
 
         private fun setMappers(serializer: KotlinxSerializer) {