From a9a36b3bed06edb1b519851d2156d4cc213d1da6 Mon Sep 17 00:00:00 2001 From: Martin Hauner Date: Wed, 2 Oct 2024 23:38:35 +0200 Subject: [PATCH] improve naming --- ...pingDefault.kt => AnnotationNameTypeMappingDefault.kt} | 2 +- .../core/processor/mapping/v2/MappingConverter.kt | 4 ++-- .../kotlin/io/openapiprocessor/core/support/Mappings.kt | 2 +- .../core/writer/java/DataTypeWriterPojoSpec.kt | 6 +++--- .../core/writer/java/DataTypeWriterRecordSpec.kt | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) rename openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/{AnnotationNameMappingDefault.kt => AnnotationNameTypeMappingDefault.kt} (90%) diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameMappingDefault.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameTypeMappingDefault.kt similarity index 90% rename from openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameMappingDefault.kt rename to openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameTypeMappingDefault.kt index 47e2f98d..c5c7f4ae 100644 --- a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameMappingDefault.kt +++ b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameTypeMappingDefault.kt @@ -5,7 +5,7 @@ package io.openapiprocessor.core.converter.mapping -open class AnnotationNameMappingDefault( +open class AnnotationNameTypeMappingDefault( /** * The parameter name of this mapping. Must match 1:1 with what is written in the api. */ diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt index c9fbe9a9..ed20e06f 100644 --- a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt +++ b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt @@ -218,7 +218,7 @@ class MappingConverter(val mapping: MappingV2) { val (mapping, genericTypes) = parseMapping(source.name, source.generics) return if (mapping.kind == ANNOTATE) { - AnnotationNameMappingDefault(mapping.sourceType!!, Annotation( + AnnotationNameTypeMappingDefault(mapping.sourceType!!, Annotation( mapping.annotationType!!, mapping.annotationParameters) ) @@ -425,7 +425,7 @@ class MappingConverter(val mapping: MappingV2) { throw BadMappingException(source.type) } - return AnnotationNameMappingDefault(mapping.sourceType!!, Annotation( + return AnnotationNameTypeMappingDefault(mapping.sourceType!!, Annotation( mapping.annotationType!!, mapping.annotationParameters)) } diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Mappings.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Mappings.kt index ed64e1e0..af6c2b37 100644 --- a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Mappings.kt +++ b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Mappings.kt @@ -113,7 +113,7 @@ class AnnotationNameTypeMappingBuilder(val sourceTypeName: String) { lateinit var type: String fun annotation(): Mapping { - return AnnotationNameMappingDefault( + return AnnotationNameTypeMappingDefault( sourceTypeName, Annotation(type, linkedMapOf())) } diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojoSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojoSpec.kt index fb0b684f..4e09ba78 100644 --- a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojoSpec.kt +++ b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojoSpec.kt @@ -489,18 +489,18 @@ class DataTypeWriterPojoSpec: StringSpec({ options.extensionMappings = mapOf( "x-foo" to ExtensionMappings( mapOf("ext" to listOf( - AnnotationNameMappingDefault( + AnnotationNameTypeMappingDefault( "ext", annotation = MappingAnnotation("annotation.Extension", linkedMapOf()) )))), "x-bar" to ExtensionMappings( mapOf( "barA" to listOf( - AnnotationNameMappingDefault( + AnnotationNameTypeMappingDefault( "barA", annotation = MappingAnnotation("annotation.BarA", linkedMapOf()) )), "barB" to listOf( - AnnotationNameMappingDefault( + AnnotationNameTypeMappingDefault( "barB", annotation = MappingAnnotation("annotation.BarB", linkedMapOf()) )) )) diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterRecordSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterRecordSpec.kt index e68cb92b..5c639cc9 100644 --- a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterRecordSpec.kt +++ b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterRecordSpec.kt @@ -15,7 +15,7 @@ import io.kotest.matchers.string.shouldStartWith import io.openapiprocessor.core.converter.ApiOptions import io.openapiprocessor.core.converter.JsonPropertyAnnotationMode import io.openapiprocessor.core.converter.mapping.Annotation -import io.openapiprocessor.core.converter.mapping.AnnotationNameMappingDefault +import io.openapiprocessor.core.converter.mapping.AnnotationNameTypeMappingDefault import io.openapiprocessor.core.converter.mapping.ExtensionMappings import io.openapiprocessor.core.extractImports import io.openapiprocessor.core.model.datatypes.* @@ -313,18 +313,18 @@ class DataTypeWriterRecordSpec: StringSpec({ options.extensionMappings = mapOf( "x-foo" to ExtensionMappings( mapOf("ext" to listOf( - AnnotationNameMappingDefault( + AnnotationNameTypeMappingDefault( "ext", annotation = Annotation("annotation.Extension", linkedMapOf()) )))), "x-bar" to ExtensionMappings( mapOf( "barA" to listOf( - AnnotationNameMappingDefault( + AnnotationNameTypeMappingDefault( "barA", annotation = Annotation("annotation.BarA", linkedMapOf()) )), "barB" to listOf( - AnnotationNameMappingDefault( + AnnotationNameTypeMappingDefault( "barB", annotation = Annotation("annotation.BarB", linkedMapOf()) )) ))