diff options
| author | vlad <vlad@driver.xyz> | 2017-04-10 14:05:21 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-04-10 14:05:21 -0700 |
| commit | 30d771fe7d2e19c1d26a04bbe0eb771fd8513d67 (patch) | |
| tree | 5df66baccafe4f5142f58cde49f23252f1e818f3 | |
| parent | 5649383cd7e830baf66049f2db4060bc581dfa99 (diff) | |
| download | driver-core-30d771fe7d2e19c1d26a04bbe0eb771fd8513d67.tar.gz driver-core-30d771fe7d2e19c1d26a04bbe0eb771fd8513d67.tar.bz2 driver-core-30d771fe7d2e19c1d26a04bbe0eb771fd8513d67.zip | |
Update to handle custom values in `Option`s
| -rw-r--r-- | src/main/scala/xyz/driver/core/swagger.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/swagger.scala b/src/main/scala/xyz/driver/core/swagger.scala index fd519f9..09dae1e 100644 --- a/src/main/scala/xyz/driver/core/swagger.scala +++ b/src/main/scala/xyz/driver/core/swagger.scala @@ -63,9 +63,9 @@ object swagger { } orElse { `type` match { case rt: ReferenceType if isOption(javaType.getRawClass) && chain.hasNext => - rt.getContentType - val nextType = rt.getContentType - val nextResolved = chain.next().resolveProperty(nextType, context, annotations, chain) + val nextType = rt.getContentType + val nextResolved = Option(resolveProperty(nextType, context, annotations, chain)).getOrElse( + chain.next().resolveProperty(nextType, context, annotations, chain)) nextResolved.setRequired(false) Option(nextResolved) case t if chain.hasNext => |