Merge pull request #20 from JuliaComputing/tan/misc

avoid error with HTTP/2 servers, update readme

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 <[email protected]>", "JuliaHub"]
-version = "0.1.5"
+version = "0.1.6"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

README.md

@@ -31,7 +31,7 @@ Check out [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) for addit
 
 Use [instructions](https://openapi-generator.tech/docs/generators) provided for the Julia OpenAPI code generator plugin to generate Julia code.
 
-> Note: It requires the Julia code generator hosted in [this forked branch](https://github.com/JuliaComputing/openapi-generator/tree/juliahub/juliacodegen) of the OpenAPI code generator. The plan is to submit it for inclusion in the upstream repo soon.
+> Note: It requires the master branch of [openapi-generator](https://github.com/OpenAPITools/openapi-generator) until it is included in the next release. It is also hosted in [this forked branch](https://github.com/JuliaComputing/openapi-generator/tree/juliahub/juliacodegen) until then.
 
 ## Generated Code Structure
 

src/client.jl

@@ -101,11 +101,15 @@ struct Client
             get_return_type::Function=get_api_return_type,
             long_polling_timeout::Int=DEFAULT_LONGPOLL_TIMEOUT_SECS,
             timeout::Int=DEFAULT_TIMEOUT_SECS,
-            pre_request_hook::Function=noop_pre_request_hook)
-        clntoptions = Dict{Symbol,Any}(:throw=>false, :verbose=>false)
+            pre_request_hook::Function=noop_pre_request_hook,
+            verbose::Bool=false,
+        )
+        clntoptions = Dict{Symbol,Any}(:throw=>false, :verbose=>verbose)
         downloader = Downloads.Downloader()
         downloader.easy_hook = (easy, opts) -> begin
             Downloads.Curl.setopt(easy, LibCURL.CURLOPT_LOW_SPEED_TIME, long_polling_timeout)
+            # disable ALPN to support servers that enable both HTTP/2 and HTTP/1.1 on same port
+            Downloads.Curl.setopt(easy, LibCURL.CURLOPT_SSL_ENABLE_ALPN, 0)
         end
         new(root, headers, get_return_type, clntoptions, downloader, Ref{Int}(timeout), pre_request_hook, long_polling_timeout)
     end

test/client/allany/AllAnyClient/src/apis/api_DefaultApi.jl

@@ -11,12 +11,12 @@ This can be used to construct the `OpenAPI.Clients.Client` instance.
 """
 basepath(::Type{ DefaultApi }) = "http://localhost"
 
-const _returntypes_echo_anyof_mapped_pets_post = Dict{Regex,Type}(
+const _returntypes_echo_anyof_mapped_pets_post_DefaultApi = Dict{Regex,Type}(
     Regex("^" * replace("200", "x"=>".") * "\$") => AnyOfMappedPets,
 )
 
 function _oacinternal_echo_anyof_mapped_pets_post(_api::DefaultApi, any_of_mapped_pets::AnyOfMappedPets; _mediaType=nothing)
-    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_anyof_mapped_pets_post, "/echo_anyof_mapped_pets", [], any_of_mapped_pets)
+    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_anyof_mapped_pets_post_DefaultApi, "/echo_anyof_mapped_pets", [], any_of_mapped_pets)
     OpenAPI.Clients.set_header_accept(_ctx, ["application/json", ])
     OpenAPI.Clients.set_header_content_type(_ctx, (_mediaType === nothing) ? ["application/json", ] : [_mediaType])
     return _ctx
@@ -37,12 +37,12 @@ function echo_anyof_mapped_pets_post(_api::DefaultApi, response_stream::Channel,
     return OpenAPI.Clients.exec(_ctx, response_stream)
 end
 
-const _returntypes_echo_anyof_pets_post = Dict{Regex,Type}(
+const _returntypes_echo_anyof_pets_post_DefaultApi = Dict{Regex,Type}(
     Regex("^" * replace("200", "x"=>".") * "\$") => AnyOfPets,
 )
 
 function _oacinternal_echo_anyof_pets_post(_api::DefaultApi, any_of_pets::AnyOfPets; _mediaType=nothing)
-    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_anyof_pets_post, "/echo_anyof_pets", [], any_of_pets)
+    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_anyof_pets_post_DefaultApi, "/echo_anyof_pets", [], any_of_pets)
     OpenAPI.Clients.set_header_accept(_ctx, ["application/json", ])
     OpenAPI.Clients.set_header_content_type(_ctx, (_mediaType === nothing) ? ["application/json", ] : [_mediaType])
     return _ctx
@@ -63,12 +63,12 @@ function echo_anyof_pets_post(_api::DefaultApi, response_stream::Channel, any_of
     return OpenAPI.Clients.exec(_ctx, response_stream)
 end
 
-const _returntypes_echo_oneof_mapped_pets_post = Dict{Regex,Type}(
+const _returntypes_echo_oneof_mapped_pets_post_DefaultApi = Dict{Regex,Type}(
     Regex("^" * replace("200", "x"=>".") * "\$") => OneOfMappedPets,
 )
 
 function _oacinternal_echo_oneof_mapped_pets_post(_api::DefaultApi, one_of_mapped_pets::OneOfMappedPets; _mediaType=nothing)
-    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_oneof_mapped_pets_post, "/echo_oneof_mapped_pets", [], one_of_mapped_pets)
+    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_oneof_mapped_pets_post_DefaultApi, "/echo_oneof_mapped_pets", [], one_of_mapped_pets)
     OpenAPI.Clients.set_header_accept(_ctx, ["application/json", ])
     OpenAPI.Clients.set_header_content_type(_ctx, (_mediaType === nothing) ? ["application/json", ] : [_mediaType])
     return _ctx
@@ -89,12 +89,12 @@ function echo_oneof_mapped_pets_post(_api::DefaultApi, response_stream::Channel,
     return OpenAPI.Clients.exec(_ctx, response_stream)
 end
 
-const _returntypes_echo_oneof_pets_post = Dict{Regex,Type}(
+const _returntypes_echo_oneof_pets_post_DefaultApi = Dict{Regex,Type}(
     Regex("^" * replace("200", "x"=>".") * "\$") => OneOfPets,
 )
 
 function _oacinternal_echo_oneof_pets_post(_api::DefaultApi, one_of_pets::OneOfPets; _mediaType=nothing)
-    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_oneof_pets_post, "/echo_oneof_pets", [], one_of_pets)
+    _ctx = OpenAPI.Clients.Ctx(_api.client, "POST", _returntypes_echo_oneof_pets_post_DefaultApi, "/echo_oneof_pets", [], one_of_pets)
     OpenAPI.Clients.set_header_accept(_ctx, ["application/json", ])
     OpenAPI.Clients.set_header_content_type(_ctx, (_mediaType === nothing) ? ["application/json", ] : [_mediaType])
     return _ctx

test/client/allany/AllAnyClient/src/models/model_AnyOfMappedPets.jl

@@ -22,3 +22,4 @@ function OpenAPI.property_type(::Type{ AnyOfMappedPets }, name::Symbol, json::Di
     end
     throw(OpenAPI.ValidationException("Invalid discriminator value: $discriminator for AnyOfMappedPets"))
 end
+

test/client/allany/AllAnyClient/src/models/model_AnyOfPets.jl

@@ -22,3 +22,4 @@ function OpenAPI.property_type(::Type{ AnyOfPets }, name::Symbol, json::Dict{Str
     end
     throw(OpenAPI.ValidationException("Invalid discriminator value: $discriminator for AnyOfPets"))
 end
+

test/client/allany/AllAnyClient/src/models/model_Cat.jl

@@ -37,3 +37,4 @@ end
 
 function OpenAPI.validate_property(::Type{ Cat }, name::Symbol, val)
 end
+

test/client/allany/AllAnyClient/src/models/model_CatAllOf.jl

@@ -32,3 +32,4 @@ end
 
 function OpenAPI.validate_property(::Type{ CatAllOf }, name::Symbol, val)
 end
+

test/client/allany/AllAnyClient/src/models/model_Dog.jl

@@ -40,3 +40,4 @@ function OpenAPI.validate_property(::Type{ Dog }, name::Symbol, val)
         OpenAPI.validate_param(name, "Dog", :enum, val, ["Dingo", "Husky", "Retriever", "Shepherd"])
     end
 end
+

test/client/allany/AllAnyClient/src/models/model_DogAllOf.jl

@@ -35,3 +35,4 @@ function OpenAPI.validate_property(::Type{ DogAllOf }, name::Symbol, val)
         OpenAPI.validate_param(name, "DogAllOf", :enum, val, ["Dingo", "Husky", "Retriever", "Shepherd"])
     end
 end
+