Skip to content

Commit 1ebb927

Browse files
haunerhauner
committed
better naming
1 parent 6ba77ce commit 1ebb927

21 files changed

+92
-92
lines changed

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class ApiConverter(
154154
}
155155

156156
private fun getAdditionalParameter(ep: Endpoint): List<AddParameterTypeMapping> {
157-
return mappingFinder.findAddParameterTypeMappings(MappingQuery(ep.path, ep.method))
157+
return mappingFinder.findAddParameterTypeMappings(MappingFinderQuery(ep.path, ep.method))
158158
}
159159

160160
private fun collectRequestBody(requestBody: RequestBody?, ep: Endpoint, dataTypes: DataTypes, resolver: RefResolver) {
@@ -340,7 +340,7 @@ class ApiConverter(
340340
}
341341

342342
private fun isExcluded(path: String, method: HttpMethod): Boolean {
343-
return mappingFinder.isEndpointExcluded(MappingQuery(path, method))
343+
return mappingFinder.isEndpointExcluded(MappingFinderQuery(path, method))
344344
}
345345

346346
private fun getInterfaceName(op: Operation, excluded: Boolean): String {

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ class DataTypeConverter(
479479
}
480480

481481
private fun getDataTypeMapping(info: SchemaInfo): TypeMapping? {
482-
return finder.findAnyTypeMapping(MappingQuery(info))
482+
return finder.findAnyTypeMapping(MappingFinderQuery(info))
483483
}
484484

485485
/**

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/MappingFinder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class MappingFinder(mappings: MappingSettings) {
166166
fun findAnnotationTypeMappings(sourceName: String, allowObject: Boolean = false): List<AnnotationTypeMapping> {
167167
val (type, format) = splitTypeName(sourceName)
168168
return findAnnotationTypeMappings(
169-
MappingQuery(
169+
MappingFinderQuery(
170170
type = type,
171171
format = format,
172172
allowObject = allowObject)

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/MappingQuery.kt renamed to ‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/MappingFinderQuery.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import io.openapiprocessor.core.model.Endpoint
1212
import io.openapiprocessor.core.model.parameters.Parameter
1313
import io.openapiprocessor.core.parser.HttpMethod
1414

15-
class MappingQuery(
15+
class MappingFinderQuery(
1616
override val path: String? = null,
1717
override val method: HttpMethod? = null,
1818
/**
@@ -37,7 +37,7 @@ class MappingQuery(
3737
companion object {
3838
// callable like constructor
3939
operator fun invoke(endpoint: Endpoint): MappingQuery {
40-
return MappingQuery(
40+
return MappingFinderQuery(
4141
endpoint.path,
4242
endpoint.method
4343
)
@@ -47,7 +47,7 @@ class MappingQuery(
4747
operator fun invoke(endpoint: Endpoint, parameter: Parameter): MappingQuery {
4848
val (type, format) = splitTypeName(parameter.dataType.getSourceName())
4949

50-
return MappingQuery(
50+
return MappingFinderQuery(
5151
endpoint.path,
5252
endpoint.method,
5353
parameter.name,
@@ -58,7 +58,7 @@ class MappingQuery(
5858

5959
// callable like constructor
6060
operator fun invoke(info: MappingSchema): MappingQuery {
61-
return MappingQuery(
61+
return MappingFinderQuery(
6262
info.getPath(),
6363
info.getMethod(),
6464
info.getName(),

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/wrapper/MultiDataTypeWrapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.openapiprocessor.core.converter.wrapper
77

88
import io.openapiprocessor.core.converter.ApiOptions
99
import io.openapiprocessor.core.converter.MappingFinder
10-
import io.openapiprocessor.core.converter.MappingQuery
10+
import io.openapiprocessor.core.converter.MappingFinderQuery
1111
import io.openapiprocessor.core.converter.SchemaInfo
1212
import io.openapiprocessor.core.converter.mapping.*
1313
import io.openapiprocessor.core.model.datatypes.CollectionDataType
@@ -61,7 +61,7 @@ class MultiDataTypeWrapper(
6161
}
6262

6363
private fun getMultiDataType(info: SchemaInfo): TargetType? {
64-
val match = finder.getMultiTypeMapping(MappingQuery(info))
64+
val match = finder.getMultiTypeMapping(MappingFinderQuery(info))
6565
if (match != null) {
6666
return match.getTargetType()
6767
}

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/wrapper/NullDataTypeWrapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.openapiprocessor.core.converter.wrapper
77

88
import io.openapiprocessor.core.converter.ApiOptions
99
import io.openapiprocessor.core.converter.MappingFinder
10-
import io.openapiprocessor.core.converter.MappingQuery
10+
import io.openapiprocessor.core.converter.MappingFinderQuery
1111
import io.openapiprocessor.core.converter.SchemaInfo
1212
import io.openapiprocessor.core.converter.mapping.TargetType
1313
import io.openapiprocessor.core.model.datatypes.DataType
@@ -47,7 +47,7 @@ open class NullDataTypeWrapper(
4747

4848
private fun getNullDataType(info: SchemaInfo): Target {
4949
// check endpoint result mapping
50-
val nullType = finder.findNullTypeMapping(MappingQuery(info))
50+
val nullType = finder.findNullTypeMapping(MappingFinderQuery(info))
5151
return Target(nullType?.getTargetType(), nullType?.undefined)
5252

5353
// not yet supported

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/wrapper/ResultDataTypeWrapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.openapiprocessor.core.converter.wrapper
77

88
import io.openapiprocessor.core.converter.*
9-
import io.openapiprocessor.core.converter.MappingQuery
9+
import io.openapiprocessor.core.converter.MappingFinderQuery
1010
import io.openapiprocessor.core.converter.mapping.*
1111
import io.openapiprocessor.core.model.datatypes.DataType
1212
import io.openapiprocessor.core.model.datatypes.GenericDataType
@@ -62,7 +62,7 @@ class ResultDataTypeWrapper(
6262
}
6363

6464
private fun getMappedResultDataType(info: SchemaInfo): TargetType? {
65-
val match = finder.getResultTypeMapping(MappingQuery(info))
65+
val match = finder.getResultTypeMapping(MappingFinderQuery(info))
6666
if (match != null) {
6767
return match.getTargetType()
6868
}

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/wrapper/SingleDataTypeWrapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.openapiprocessor.core.converter.wrapper
77

88
import io.openapiprocessor.core.converter.ApiOptions
99
import io.openapiprocessor.core.converter.MappingFinder
10-
import io.openapiprocessor.core.converter.MappingQuery
10+
import io.openapiprocessor.core.converter.MappingFinderQuery
1111
import io.openapiprocessor.core.converter.SchemaInfo
1212
import io.openapiprocessor.core.converter.mapping.*
1313
import io.openapiprocessor.core.model.datatypes.DataType
@@ -54,7 +54,7 @@ class SingleDataTypeWrapper(
5454
}
5555

5656
private fun getSingleResultDataType(info: SchemaInfo): TargetType? {
57-
val match = finder.getSingleTypeMapping(MappingQuery(info))
57+
val match = finder.getSingleTypeMapping(MappingFinderQuery(info))
5858
if (match != null) {
5959
return match.getTargetType()
6060
}

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/InterfaceWriter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.openapiprocessor.core.writer.java
77

88
import io.openapiprocessor.core.converter.ApiOptions
99
import io.openapiprocessor.core.converter.MappingFinder
10-
import io.openapiprocessor.core.converter.MappingQuery
10+
import io.openapiprocessor.core.converter.MappingFinderQuery
1111
import io.openapiprocessor.core.framework.AnnotationType
1212
import io.openapiprocessor.core.framework.FrameworkAnnotations
1313
import io.openapiprocessor.core.model.Annotation
@@ -114,7 +114,7 @@ class InterfaceWriter(
114114

115115
private fun getMappingAnnotationsImports(endpoint: Endpoint, parameter: Parameter): Set<String> {
116116
val mappingFinder = MappingFinder(apiOptions)
117-
val query = MappingQuery(endpoint, parameter)
117+
val query = MappingFinderQuery(endpoint, parameter)
118118

119119
val mappingAnnotations = mutableSetOf<String>()
120120

@@ -141,7 +141,7 @@ class InterfaceWriter(
141141

142142
private fun addImports(endpoint: Endpoint, response: EndpointResponse, imports: MutableSet<String>) {
143143
val mappingFinder = MappingFinder(apiOptions)
144-
val resultStyle = mappingFinder.findResultStyleMapping(MappingQuery(endpoint))
144+
val resultStyle = mappingFinder.findResultStyleMapping(MappingFinderQuery(endpoint))
145145
val responseImports: MutableSet<String> = response.getResponseImports(resultStyle).toMutableSet()
146146

147147
if (responseImports.isNotEmpty()) {

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/MethodWriter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ open class MethodWriter(
6262

6363
private fun createResult(endpoint: Endpoint, endpointResponse: EndpointResponse): String {
6464
val mappingFinder = MappingFinder(apiOptions)
65-
val resultStyle = mappingFinder.findResultStyleMapping(MappingQuery(endpoint))
65+
val resultStyle = mappingFinder.findResultStyleMapping(MappingFinderQuery(endpoint))
6666
return endpointResponse.getResponseType(resultStyle)
6767
}
6868

@@ -172,12 +172,12 @@ open class MethodWriter(
172172

173173
mappingAnnotations.addAll(
174174
mappingFinder
175-
.findAnnotationParameterTypeMappings(MappingQuery(endpoint, parameter))
175+
.findAnnotationParameterTypeMappings(MappingFinderQuery(endpoint, parameter))
176176
.map { it.annotation })
177177

178178
mappingAnnotations.addAll(
179179
mappingFinder
180-
.findAnnotationParameterNameTypeMapping(MappingQuery(endpoint, parameter))
180+
.findAnnotationParameterNameTypeMapping(MappingFinderQuery(endpoint, parameter))
181181
.map { it.annotation })
182182

183183
mappingAnnotations.forEach {

‎openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/MappingFinderAnnotationSpec.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class MappingFinderAnnotationSpec: StringSpec({
2222

2323
val finder = MappingFinder(options)
2424

25-
val mapping = finder.findAnnotationTypeMappings(MappingQuery(type = "Foo"))
25+
val mapping = finder.findAnnotationTypeMappings(MappingFinderQuery(type = "Foo"))
2626

2727
mapping.size shouldBe 1
2828
mapping.first().sourceTypeName shouldBe "Foo"
@@ -38,7 +38,7 @@ class MappingFinderAnnotationSpec: StringSpec({
3838

3939
val finder = MappingFinder(options)
4040

41-
val mapping = finder.findAnnotationTypeMappings(MappingQuery(type = "Foo", allowObject = true))
41+
val mapping = finder.findAnnotationTypeMappings(MappingFinderQuery(type = "Foo", allowObject = true))
4242

4343
mapping.size shouldBe 1
4444
mapping.first().sourceTypeName shouldBe "object"
@@ -54,10 +54,10 @@ class MappingFinderAnnotationSpec: StringSpec({
5454

5555
val finder = MappingFinder(options)
5656

57-
val mappingSimple = finder.findAnnotationTypeMappings(MappingQuery(type = "Foo"))
57+
val mappingSimple = finder.findAnnotationTypeMappings(MappingFinderQuery(type = "Foo"))
5858
mappingSimple.shouldBeEmpty()
5959

60-
val mappingCollection = finder.findAnnotationTypeMappings(MappingQuery(type = "Foo[]"))
60+
val mappingCollection = finder.findAnnotationTypeMappings(MappingFinderQuery(type = "Foo[]"))
6161
mappingCollection.shouldBeEmpty()
6262
}
6363

@@ -71,7 +71,7 @@ class MappingFinderAnnotationSpec: StringSpec({
7171

7272
val finder = MappingFinder(options)
7373

74-
val mapping = finder.findAnnotationTypeMappings(MappingQuery(type = "string", format = "uuid"))
74+
val mapping = finder.findAnnotationTypeMappings(MappingFinderQuery(type = "string", format = "uuid"))
7575

7676
mapping.size shouldBe 1
7777
mapping.first().sourceTypeName shouldBe "string"
@@ -88,7 +88,7 @@ class MappingFinderAnnotationSpec: StringSpec({
8888

8989
val finder = MappingFinder(options)
9090

91-
val mapping = finder.findAnnotationParameterTypeMappings(MappingQuery(type = "Foo"))
91+
val mapping = finder.findAnnotationParameterTypeMappings(MappingFinderQuery(type = "Foo"))
9292

9393
mapping.size shouldBe 1
9494
mapping.first().sourceTypeName shouldBe "Foo"
@@ -104,7 +104,7 @@ class MappingFinderAnnotationSpec: StringSpec({
104104

105105
val finder = MappingFinder(options)
106106

107-
val mapping = finder.findAnnotationParameterTypeMappings(MappingQuery(type = "string", format = "uuid"))
107+
val mapping = finder.findAnnotationParameterTypeMappings(MappingFinderQuery(type = "string", format = "uuid"))
108108

109109
mapping.size shouldBe 1
110110
mapping.first().sourceTypeName shouldBe "string"
@@ -123,7 +123,7 @@ class MappingFinderAnnotationSpec: StringSpec({
123123

124124
val finder = MappingFinder(options)
125125

126-
val mapping = finder.findAnnotationParameterNameTypeMapping(MappingQuery(name = "foo"))
126+
val mapping = finder.findAnnotationParameterNameTypeMapping(MappingFinderQuery(name = "foo"))
127127

128128
mapping.size shouldBe 1
129129
mapping.first().name shouldBe "foo"

‎openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/mapping/MappingFinderSpec.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import io.kotest.matchers.nulls.shouldBeNull
1313
import io.kotest.matchers.nulls.shouldNotBeNull
1414
import io.kotest.matchers.shouldBe
1515
import io.openapiprocessor.core.converter.MappingFinder
16-
import io.openapiprocessor.core.converter.MappingQuery
16+
import io.openapiprocessor.core.converter.MappingFinderQuery
1717
import io.openapiprocessor.core.parser.HttpMethod
1818
import io.openapiprocessor.core.processor.MappingReader
1919
import io.openapiprocessor.core.processor.mapping.v2.Mapping
@@ -316,21 +316,21 @@ class MappingFinderSpec: StringSpec({
316316

317317
// then:
318318
val resultTypeMapping = finder.getResultTypeMapping(
319-
MappingQuery(path = "/bar", method = HttpMethod.GET)
319+
MappingFinderQuery(path = "/bar", method = HttpMethod.GET)
320320
)!!
321321

322322
resultTypeMapping.targetTypeName shouldBe "io.openapiprocessor.WrapGlobal"
323323
resultTypeMapping.genericTypes.shouldBeEmpty()
324324

325325
val resultTypeMappingPath = finder.getResultTypeMapping(
326-
MappingQuery(path = "/foo", method = HttpMethod.POST)
326+
MappingFinderQuery(path = "/foo", method = HttpMethod.POST)
327327
)!!
328328

329329
resultTypeMappingPath.targetTypeName shouldBe "io.openapiprocessor.WrapPath"
330330
resultTypeMappingPath.genericTypes.shouldBeEmpty()
331331

332332
val resultTypeMappingGet = finder.getResultTypeMapping(
333-
MappingQuery(path = "/foo", method = HttpMethod.GET)
333+
MappingFinderQuery(path = "/foo", method = HttpMethod.GET)
334334
)!!
335335

336336
resultTypeMappingGet.targetTypeName shouldBe "io.openapiprocessor.WrapMethod"
@@ -367,42 +367,42 @@ class MappingFinderSpec: StringSpec({
367367

368368
// then:
369369
val singleTypeMappingG = finder.getSingleTypeMapping(
370-
MappingQuery(path = "/bar", method = HttpMethod.GET)
370+
MappingFinderQuery(path = "/bar", method = HttpMethod.GET)
371371
)!!
372372

373373
singleTypeMappingG.sourceTypeName shouldBe "single"
374374
singleTypeMappingG.targetTypeName shouldBe "reactor.core.publisher.MonoGlobal"
375375

376376
val multiTypeMappingG = finder.getMultiTypeMapping(
377-
MappingQuery(path = "/bar", method = HttpMethod.GET)
377+
MappingFinderQuery(path = "/bar", method = HttpMethod.GET)
378378
)!!
379379

380380
multiTypeMappingG.sourceTypeName shouldBe "multi"
381381
multiTypeMappingG.targetTypeName shouldBe "reactor.core.publisher.FluxGlobal"
382382

383383
val singleTypeMappingP = finder.getSingleTypeMapping(
384-
MappingQuery(path = "/foo", method = HttpMethod.POST)
384+
MappingFinderQuery(path = "/foo", method = HttpMethod.POST)
385385
)!!
386386

387387
singleTypeMappingP.sourceTypeName shouldBe "single"
388388
singleTypeMappingP.targetTypeName shouldBe "reactor.core.publisher.MonoPath"
389389

390390
val multiTypeMappingP = finder.getMultiTypeMapping(
391-
MappingQuery(path = "/foo", method = HttpMethod.POST)
391+
MappingFinderQuery(path = "/foo", method = HttpMethod.POST)
392392
)!!
393393

394394
multiTypeMappingP.sourceTypeName shouldBe "multi"
395395
multiTypeMappingP.targetTypeName shouldBe "reactor.core.publisher.FluxPath"
396396

397397
val singleTypeMappingGet = finder.getSingleTypeMapping(
398-
MappingQuery(path = "/foo", method = HttpMethod.GET)
398+
MappingFinderQuery(path = "/foo", method = HttpMethod.GET)
399399
)!!
400400

401401
singleTypeMappingGet.sourceTypeName shouldBe "single"
402402
singleTypeMappingGet.targetTypeName shouldBe "reactor.core.publisher.MonoMethod"
403403

404404
val multiTypeMappingGet = finder.getMultiTypeMapping(
405-
MappingQuery(path = "/foo", method = HttpMethod.GET)
405+
MappingFinderQuery(path = "/foo", method = HttpMethod.GET)
406406
)!!
407407

408408
multiTypeMappingGet.sourceTypeName shouldBe "multi"

0 commit comments

Comments
 (0)