Skip to content

Commit ed2db6b

Browse files
committed
improved code structure
1 parent 39760bd commit ed2db6b

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/main/groovy/com/github/hauner/openapi/spring/converter/ApiConverter.groovy

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import com.github.hauner.openapi.spring.model.datatypes.DataType
3636
import com.github.hauner.openapi.support.Identifier
3737
import groovy.util.logging.Slf4j
3838
import io.swagger.v3.oas.models.OpenAPI
39+
import io.swagger.v3.oas.models.Operation
3940
import io.swagger.v3.oas.models.PathItem
4041
import io.swagger.v3.oas.models.media.MediaType
4142
import io.swagger.v3.oas.models.parameters.Parameter
@@ -93,9 +94,7 @@ class ApiConverter {
9394
Endpoint ep = new Endpoint (path: path, method: httpOperation.httpMethod)
9495

9596
try {
96-
httpOperation.parameters.each { Parameter parameter ->
97-
ep.parameters.add (createParameter(path, parameter, target, resolver))
98-
}
97+
collectParameters (httpOperation.parameters, ep, target.models, resolver)
9998

10099
if (httpOperation.requestBody != null) {
101100
def required = httpOperation.requestBody.required != null ?: false
@@ -141,6 +140,12 @@ class ApiConverter {
141140
}
142141
}
143142

143+
private void collectParameters (List<Parameter> parameters, Endpoint ep, DataTypes dataTypes, resolver) {
144+
parameters.each { Parameter parameter ->
145+
ep.parameters.add (createParameter (ep.path, parameter, dataTypes, resolver))
146+
}
147+
}
148+
144149
private Collection<ModelParameter> createMultipartParameter (SchemaInfo info, boolean required) {
145150
DataType dataType = dataTypeConverter.convert (info, new DataTypes())
146151
if (! (dataType instanceof ObjectDataType)) {
@@ -161,11 +166,11 @@ class ApiConverter {
161166
required: required)
162167
}
163168

164-
private ModelParameter createParameter (String path, Parameter parameter, Api target, resolver) {
169+
private ModelParameter createParameter (String path, Parameter parameter, DataTypes dataTypes, resolver) {
165170
def info = new ParameterSchemaInfo (path, parameter.schema, parameter.name)
166171
info.resolver = resolver
167172

168-
DataType dataType = dataTypeConverter.convert (info, target.models)
173+
DataType dataType = dataTypeConverter.convert (info, dataTypes)
169174

170175
switch (parameter.in) {
171176
case 'query':

0 commit comments

Comments
 (0)