Skip to content

handle object type on global parameter mapping #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2019
Merged

handle object type on global parameter mapping #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,16 @@ class DataTypeConverter {
)
}
}

// check global parameter mapping
List<ParameterTypeMapping> parameters = getParameterMappings (options.typeMappings)
def parameter = parameters.find { it.parameterName == pn && it.mapping.sourceTypeName == 'object' }
if (parameter) {
return new TargetType (
typeName: parameter.mapping.targetTypeName,
genericNames: parameter.mapping.genericTypeNames
)
}
}

// check global mapping
Expand Down
45 changes: 31 additions & 14 deletions ...m/github/hauner/openapi/spring/converter/DataTypeConverterParameterTypeMappingSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ import com.github.hauner.openapi.spring.converter.mapping.ParameterTypeMapping
import com.github.hauner.openapi.spring.converter.mapping.TypeMapping
import com.github.hauner.openapi.spring.model.Api
import spock.lang.Specification
import spock.lang.Unroll

import static com.github.hauner.openapi.spring.support.OpenApiParser.parse

class DataTypeConverterParameterTypeMappingSpec extends Specification {

void "converts object parameter schema to java type via endpoint mapping" () {
@Unroll
void "converts object parameter schema to java type via #type" () {
def openApi = parse ("""\
openapi: 3.0.2
info:
Expand All @@ -53,25 +55,40 @@ paths:
""")

when:
def options = new ApiOptions(
packageName: 'pkg',
typeMappings: [
new EndpointTypeMapping (path: '/foobar',
typeMappings: [
new ParameterTypeMapping (
parameterName: 'foobar',
mapping: new TypeMapping(
sourceTypeName: 'object',
targetTypeName: 'pkg.TargetClass')
)
])
])
def options = new ApiOptions(packageName: 'pkg', typeMappings: mappings)
Api api = new ApiConverter (options).convert (openApi)

then:
def itf = api.interfaces.first ()
def ep = itf.endpoints.first ()
ep.parameters.first ().dataType.name == 'TargetClass'

where:
type << [
'endpoint parameter mapping',
'global parameter mapping'
]

mappings << [
[
new EndpointTypeMapping (path: '/foobar',
typeMappings: [
new ParameterTypeMapping (
parameterName: 'foobar',
mapping: new TypeMapping (
sourceTypeName: 'object',
targetTypeName: 'pkg.TargetClass')
)
])
], [
new ParameterTypeMapping (
parameterName: 'foobar',
mapping: new TypeMapping (
sourceTypeName: 'object',
targetTypeName: 'pkg.TargetClass')
)
]
]
}

}