add support for anyOf and oneOf

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.0"
+version = "0.1.1"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

README.md

@@ -155,7 +155,7 @@ The order in which middlewares are invoked are:
 ## TODO
 
 Not all OpenAPI features are supported yet, e.g.:
-- [`oneOf`, `anyOf`, `allOf`, `not`](https://swagger.io/docs/specification/data-models/oneof-anyof-allof-not/)
+- [`not`](https://swagger.io/docs/specification/data-models/oneof-anyof-allof-not/)
 - [inheritance and polymorphism](https://swagger.io/docs/specification/data-models/inheritance-and-polymorphism/)
 - [some of the JSON schema keywords](https://swagger.io/docs/specification/data-models/keywords/)
 - some [subtler data types](https://swagger.io/docs/specification/data-models/data-types/)

src/commontypes.jl

@@ -1,5 +1,8 @@
 abstract type APIModel end
 abstract type APIClientImpl end
+abstract type UnionAPIModel <: APIModel end
+abstract type OneOfAPIModel <: UnionAPIModel end
+abstract type AnyOfAPIModel <: UnionAPIModel end
 struct OpenAPIException <: Exception
     reason::String
 end

src/json.jl

@@ -24,6 +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)
 
 to_json(o) = JSON.json(o)
 
@@ -33,6 +34,10 @@ from_json(::Type{T}, json::Dict{String,Any}) where {T <: Dict} = convert(T, json
 from_json(::Type{T}, j::Dict{String,Any}) where {T <: String} = to_json(j)
 from_json(::Type{Any}, j::Dict{String,Any}) = j
 
+function from_json(o::T, json::Dict{String,Any}) where {T <: UnionAPIModel}
+    return from_json(o, :value, json)
+end
+
 function from_json(o::T, json::Dict{String,Any}) where {T <: APIModel}
     jsonkeys = [Symbol(k) for k in keys(json)]
     for name in intersect(propertynames(o), jsonkeys)
@@ -42,7 +47,7 @@ function from_json(o::T, json::Dict{String,Any}) where {T <: APIModel}
 end
 
 function from_json(o::T, name::Symbol, json::Dict{String,Any}) where {T <: APIModel}
-    ftype = property_type(T, name)
+    ftype = (T <: UnionAPIModel) ? property_type(T, name, json) : property_type(T, name)
     fval = from_json(ftype, json)
     setfield!(o, name, convert(ftype, fval))
     return o

test/client/allany/AllAnyClient/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

test/client/allany/AllAnyClient/.openapi-generator/FILES

@@ -0,0 +1,23 @@
+README.md
+docs/AnyOfMappedPets.md
+docs/AnyOfPets.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/OneOfMappedPets.md
+docs/OneOfPets.md
+docs/Pet.md
+src/AllAnyClient.jl
+src/apis/api_DefaultApi.jl
+src/modelincludes.jl
+src/models/model_AnyOfMappedPets.jl
+src/models/model_AnyOfPets.jl
+src/models/model_Cat.jl
+src/models/model_CatAllOf.jl
+src/models/model_Dog.jl
+src/models/model_DogAllOf.jl
+src/models/model_OneOfMappedPets.jl
+src/models/model_OneOfPets.jl
+src/models/model_Pet.jl

test/client/allany/AllAnyClient/.openapi-generator/VERSION

@@ -0,0 +1 @@
+6.3.0-SNAPSHOT

test/client/allany/AllAnyClient/README.md

@@ -0,0 +1,49 @@
+# Julia API client for AllAnyClient
+
+API to test code generation for oneof anyof allof
+
+## Overview
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
+
+- API version: 0.0.1
+- Build package: org.openapitools.codegen.languages.JuliaClientCodegen
+
+
+## Installation
+Place the Julia files generated under the `src` folder in your Julia project. Include AllAnyClient.jl in the project code.
+It would include the module named AllAnyClient.
+
+Documentation is generated as markdown files under the `docs` folder. You can include them in your project documentation.
+Documentation is also embedded in Julia which can be used with a Julia specific documentation generator.
+
+## API Endpoints
+
+Class | Method
+------------ | -------------
+*DefaultApi* | [**echo_anyof_mapped_pets_post**](docs/DefaultApi.md#echo_anyof_mapped_pets_post)<br/>**POST** /echo_anyof_mapped_pets<br/>
+*DefaultApi* | [**echo_anyof_pets_post**](docs/DefaultApi.md#echo_anyof_pets_post)<br/>**POST** /echo_anyof_pets<br/>
+*DefaultApi* | [**echo_oneof_mapped_pets_post**](docs/DefaultApi.md#echo_oneof_mapped_pets_post)<br/>**POST** /echo_oneof_mapped_pets<br/>
+*DefaultApi* | [**echo_oneof_pets_post**](docs/DefaultApi.md#echo_oneof_pets_post)<br/>**POST** /echo_oneof_pets<br/>
+
+
+## Models
+
+ - [AnyOfMappedPets](docs/AnyOfMappedPets.md)
+ - [AnyOfPets](docs/AnyOfPets.md)
+ - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
+ - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
+ - [OneOfMappedPets](docs/OneOfMappedPets.md)
+ - [OneOfPets](docs/OneOfPets.md)
+ - [Pet](docs/Pet.md)
+
+
+## Authorization
+ Endpoints do not require authorization.
+
+
+## Author
+
+test@example.com
+

test/client/allany/AllAnyClient/docs/AnyOfMappedPets.md

@@ -0,0 +1,19 @@
+# AnyOfMappedPets
+
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | This is a anyOf model. The value must be any of the following types: Cat, Dog |  | [optional] 
+
+The discriminator field is `pet_type` with the following mapping:
+ - `cat`: `Cat`
+ - `dog`: `Dog`
+
+
+
+
+[[Back to Model list]](../README.md#models) [[Back to API list]](../README.md#api-endpoints) [[Back to README]](../README.md)
+
+

test/client/allany/AllAnyClient/docs/AnyOfPets.md

@@ -0,0 +1,16 @@
+# AnyOfPets
+
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | This is a anyOf model. The value must be any of the following types: Cat, Dog |  | [optional] 
+
+The discriminator field is `pet_type`
+
+
+
+[[Back to Model list]](../README.md#models) [[Back to API list]](../README.md#api-endpoints) [[Back to README]](../README.md)
+
+