From 30d771fe7d2e19c1d26a04bbe0eb771fd8513d67 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 10 Apr 2017 14:05:21 -0700 Subject: Update to handle custom values in `Option`s --- src/main/scala/xyz/driver/core/swagger.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz/driver') 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 => -- cgit v1.2.3