Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Elixir] Update Tesla dependency to version 1.0 #2326

Merged
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
String supportedElixirVersion = "1.4";
List<String> extraApplications = Arrays.asList(":logger");
List<String> deps = Arrays.asList(
"{:tesla, \"~> 0.8\"}",
"{:tesla, \"~> 1.0.0\"}",
"{:poison, \">= 1.0.0\"}"
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ defmodule {{moduleName}}.Connection do

# Add any middleware here (authentication)
plug Tesla.Middleware.BaseUrl, "{{{basePath}}}"
plug Tesla.Middleware.Headers, %{"User-Agent" => "Elixir"}
plug Tesla.Middleware.EncodeJson
plug Tesla.Middleware.Headers, [{"user-agent", "Elixir"}]
plug Tesla.Middleware.EncodeJson, engine: Poison

{{#hasAuthMethods}}
{{#authMethods}}
Expand All @@ -34,7 +34,7 @@ defmodule {{moduleName}}.Connection do
@spec new(String.t) :: Tesla.Env.client
def new(token) when is_binary(token) do
Tesla.build_client([
{Tesla.Middleware.Headers, %{"Authorization" => "Bearer #{token}"}}
{Tesla.Middleware.Headers, [{"authorization", "Bearer #{token}"}]}
])
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ defmodule {{moduleName}}.RequestBuilder do
end
def add_param(request, :headers, key, value) do
request
|> Map.update(:headers, %{key => value}, &(Map.put(&1, key, value)))
|> Tesla.put_header(key, value)
end
def add_param(request, :file, name, path) do
request
Expand All @@ -107,20 +107,22 @@ defmodule {{moduleName}}.RequestBuilder do

## Parameters

- arg1 (Tesla.Env.t | term) - The response object
- arg1 ({:ok, Tesla.Env.t} | term) - The response object
- arg2 (:false | struct | [struct]) - The shape of the struct to deserialize into

## Returns

{:ok, struct} on success
{:error, term} on failure
"""
@spec decode(Tesla.Env.t | term()) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode(%Tesla.Env{status: 200, body: body}), do: Poison.decode(body)
@spec decode({:ok, Tesla.Env.t} | term()) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode({:ok, %Tesla.Env{status: 200, body: body}}), do: Poison.decode(body)
def decode(response), do: {:error, response}
def decode({:error, _} = error), do: error

@spec decode(Tesla.Env.t | term(), :false | struct() | [struct()]) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode(%Tesla.Env{status: 200} = env, false), do: {:ok, env}
def decode(%Tesla.Env{status: 200, body: body}, struct), do: Poison.decode(body, as: struct)
@spec decode({:ok, Tesla.Env.t} | term(), :false | struct() | [struct()]) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode({:ok, %Tesla.Env{status: 200}} = env, false), do: {:ok, env}
def decode({:ok, %Tesla.Env{status: 200, body: body}}, struct), do: Poison.decode(body, as: struct)
def decode({:error, _} = error, _struct), do: error
def decode(response, _struct), do: {:error, response}
end
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ defmodule OpenapiPetstore.Connection do

# Add any middleware here (authentication)
plug Tesla.Middleware.BaseUrl, "http://petstore.swagger.io:80/v2"
plug Tesla.Middleware.Headers, %{"User-Agent" => "Elixir"}
plug Tesla.Middleware.EncodeJson
plug Tesla.Middleware.Headers, [{"user-agent", "Elixir"}]
plug Tesla.Middleware.EncodeJson, engine: Poison

@doc """
Configure a client connection using Basic authentication.
Expand Down Expand Up @@ -51,7 +51,7 @@ defmodule OpenapiPetstore.Connection do
@spec new(String.t) :: Tesla.Env.client
def new(token) when is_binary(token) do
Tesla.build_client([
{Tesla.Middleware.Headers, %{"Authorization" => "Bearer #{token}"}}
{Tesla.Middleware.Headers, [{"authorization", "Bearer #{token}"}]}
])
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ defmodule OpenapiPetstore.RequestBuilder do
end
def add_param(request, :headers, key, value) do
request
|> Map.update(:headers, %{key => value}, &(Map.put(&1, key, value)))
|> Tesla.put_header(key, value)
end
def add_param(request, :file, name, path) do
request
Expand All @@ -110,20 +110,22 @@ defmodule OpenapiPetstore.RequestBuilder do

## Parameters

- arg1 (Tesla.Env.t | term) - The response object
- arg1 ({:ok, Tesla.Env.t} | term) - The response object
- arg2 (:false | struct | [struct]) - The shape of the struct to deserialize into

## Returns

{:ok, struct} on success
{:error, term} on failure
"""
@spec decode(Tesla.Env.t | term()) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode(%Tesla.Env{status: 200, body: body}), do: Poison.decode(body)
@spec decode({:ok, Tesla.Env.t} | term()) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode({:ok, %Tesla.Env{status: 200, body: body}}), do: Poison.decode(body)
def decode(response), do: {:error, response}
def decode({:error, _} = error), do: error

@spec decode(Tesla.Env.t | term(), :false | struct() | [struct()]) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode(%Tesla.Env{status: 200} = env, false), do: {:ok, env}
def decode(%Tesla.Env{status: 200, body: body}, struct), do: Poison.decode(body, as: struct)
@spec decode({:ok, Tesla.Env.t} | term(), :false | struct() | [struct()]) :: {:ok, struct()} | {:error, Tesla.Env.t} | {:error, term()}
def decode({:ok, %Tesla.Env{status: 200}} = env, false), do: {:ok, env}
def decode({:ok, %Tesla.Env{status: 200, body: body}}, struct), do: Poison.decode(body, as: struct)
def decode({:error, _} = error, _struct), do: error
def decode(response, _struct), do: {:error, response}
end
2 changes: 1 addition & 1 deletion samples/client/petstore/elixir/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ defmodule OpenapiPetstore.Mixfile do
# Type "mix help deps" for more examples and options
defp deps do
[
{:tesla, "~> 0.8"},
{:tesla, "~> 1.0.0"},
{:poison, ">= 1.0.0"}
]
end
Expand Down