Merge pull request #8 from JuliaComputing/tan/misc

fix json parsing for union types

Author: tanmaykm

Project.toml

@@ -4,7 +4,7 @@ keywords = ["Swagger", "OpenAPI", "REST"]
 license = "MIT"
 desc = "OpenAPI server and client helper for Julia"
 authors = ["Tanmay Mohapatra <tanmaykm@gmail.com>"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/client.jl

@@ -9,7 +9,7 @@ using TimeZones
 using LibCURL
 
 import Base: convert, show, summary, getproperty, setproperty!, iterate
-import ..OpenAPI: APIModel, APIClientImpl, OpenAPIException, InvocationException, to_json, from_json, validate_property, property_type
+import ..OpenAPI: APIModel, UnionAPIModel, APIClientImpl, OpenAPIException, InvocationException, to_json, from_json, validate_property, property_type
 import ..OpenAPI: str2zoneddatetime, str2datetime, str2date
 
 # collection formats (OpenAPI v2)
@@ -507,6 +507,7 @@ end
 convert(::Type{T}, json::Dict{String,Any}) where {T<:APIModel} = from_json(T, json)
 convert(::Type{T}, v::Nothing) where {T<:APIModel} = T()
 
+show(io::IO, model::T) where {T<:UnionAPIModel} = print(io, JSON.json(model.value, 2))
 show(io::IO, model::T) where {T<:APIModel} = print(io, JSON.json(model, 2))
 summary(model::T) where {T<:APIModel} = print(io, T)
 

src/json.jl

@@ -24,7 +24,7 @@ function iterate(w::JSONWrapper, state...)
 end
 
 lower(o::T) where {T<:APIModel} = JSONWrapper(o)
-lower(o::T) where {T<:UnionAPIModel} = JSONWrapper(o.value)
+lower(o::T) where {T<:UnionAPIModel} = typeof(o.value) <: APIModel ? JSONWrapper(o.value) : to_json(o.value)
 
 to_json(o) = JSON.json(o)
 
@@ -81,7 +81,13 @@ function from_json(o::T, name::Symbol, v::Vector) where {T <: APIModel}
     elseif Date <: veltype
         setfield!(o, name, map(str2date, v))
     else
-        setfield!(o, name, convert(ftype, v))
+        if (vtype <: Vector) && (veltype <: OpenAPI.UnionAPIModel)
+            setfield!(o, name, map(veltype, v))
+        elseif ftype <: OpenAPI.UnionAPIModel
+            setfield!(o, name, ftype(v))
+        else
+            setfield!(o, name, convert(ftype, v))
+        end
     end
     return o
 end