Skip to content

Commit 954847b

Browse files
committed
adapt to core api changes
1 parent a3dfb60 commit 954847b

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

src/main/kotlin/io/openapiprocessor/spring/processor/SpringFramework.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import io.openapiprocessor.core.model.parameters.Parameter
1111
import io.openapiprocessor.spring.model.RequestBody
1212
import io.openapiprocessor.spring.model.parameters.MultipartParameter
1313
import io.openapiprocessor.spring.model.parameters.QueryParameter
14-
import io.openapiprocessor.core.parser.MultipartParameter as MultipartParserParameter
15-
import io.openapiprocessor.core.parser.Parameter as ParserParameter
16-
import io.openapiprocessor.core.parser.RequestBody as ParserRequestBody
14+
import io.openapiprocessor.core.openapi.Parameter as OpenApiParameter
15+
import io.openapiprocessor.core.openapi.RequestBody as OpenApiRequestBody
16+
import io.openapiprocessor.core.parser.MultipartParameter as ParserMultipartParameter
1717

1818
/**
1919
* Spring model factory.
@@ -23,16 +23,16 @@ import io.openapiprocessor.core.parser.RequestBody as ParserRequestBody
2323
class SpringFramework: FrameworkBase() {
2424

2525
@Override
26-
override fun createQueryParameter(parameter: ParserParameter, dataType: DataType): Parameter {
26+
override fun createQueryParameter(parameter: OpenApiParameter, dataType: DataType): Parameter {
2727
return QueryParameter (
2828
parameter.getName(),
2929
dataType,
3030
parameter.isRequired(),
3131
parameter.isDeprecated())
3232
}
3333

34-
override fun createMultipartParameter(parameter: ParserParameter, dataType: DataType): Parameter {
35-
val mpp = parameter as MultipartParserParameter
34+
override fun createMultipartParameter(parameter: OpenApiParameter, dataType: DataType): Parameter {
35+
val mpp = parameter as ParserMultipartParameter
3636

3737
return MultipartParameter(
3838
parameter.getName(),
@@ -44,7 +44,7 @@ class SpringFramework: FrameworkBase() {
4444
)
4545
}
4646

47-
override fun createRequestBody(contentType: String, requestBody: ParserRequestBody, dataType: DataType): RequestBody {
47+
override fun createRequestBody(contentType: String, requestBody: OpenApiRequestBody, dataType: DataType): RequestBody {
4848
return RequestBody(
4949
"body",
5050
contentType,

src/main/kotlin/io/openapiprocessor/spring/processor/SpringFrameworkAnnotations.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ import io.openapiprocessor.core.model.parameters.CookieParameter
1414
import io.openapiprocessor.core.model.parameters.HeaderParameter
1515
import io.openapiprocessor.core.model.parameters.Parameter
1616
import io.openapiprocessor.core.model.parameters.PathParameter
17-
import io.openapiprocessor.core.parser.HttpMethod
17+
import io.openapiprocessor.core.openapi.HttpMethod
1818
import io.openapiprocessor.spring.model.parameters.MultipartParameter
1919
import io.openapiprocessor.spring.model.parameters.QueryParameter
2020
import org.slf4j.Logger
2121
import org.slf4j.LoggerFactory
2222

2323
/**
24-
* provides Spring annotation details.
24+
* provides Spring mapping annotation details.
25+
*
26+
* todo rename to SpringFrameworkMapping
2527
*/
2628
class SpringFrameworkAnnotations: FrameworkAnnotations {
2729
private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)

src/test/groovy/io/openapiprocessor/spring/writer/java/MappingAnnotationFactorySpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package io.openapiprocessor.spring.writer.java
88
import io.openapiprocessor.core.model.Documentation
99
import io.openapiprocessor.core.model.EmptyResponse
1010
import io.openapiprocessor.core.model.Endpoint
11-
import io.openapiprocessor.core.parser.HttpMethod
11+
import io.openapiprocessor.core.openapi.HttpMethod
1212
import io.openapiprocessor.core.model.RequestBody
1313
import io.openapiprocessor.core.model.Response
1414
import io.openapiprocessor.core.model.datatypes.StringDataType

src/test/groovy/io/openapiprocessor/spring/writer/java/MethodWriterSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import io.openapiprocessor.spring.processor.SpringFrameworkAnnotations
2727
import io.openapiprocessor.core.converter.ApiOptions
2828
import io.openapiprocessor.core.model.EmptyResponse
2929
import io.openapiprocessor.core.model.Endpoint
30-
import io.openapiprocessor.core.parser.HttpMethod
30+
import io.openapiprocessor.core.openapi.HttpMethod
3131
import io.openapiprocessor.core.writer.java.BeanValidationFactory
3232
import io.openapiprocessor.core.writer.java.MethodWriter
3333
import spock.lang.Specification

src/test/kotlin/io/openapiprocessor/spring/writer/java/StatusAnnotationWriterSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import io.kotest.matchers.equals.shouldBeEqual
1010
import io.openapiprocessor.core.model.Endpoint
1111
import io.openapiprocessor.core.model.Response
1212
import io.openapiprocessor.core.model.datatypes.NoneDataType
13-
import io.openapiprocessor.core.parser.HttpMethod
13+
import io.openapiprocessor.core.openapi.HttpMethod
1414
import io.openapiprocessor.spring.processor.SpringFrameworkAnnotations
1515
import java.io.StringWriter
1616

0 commit comments

Comments
 (0)