Skip to content

Commit a96239d

Browse files
committed
avoid trailing comma
1 parent dd4bc33 commit a96239d

9 files changed

Lines changed: 12 additions & 8 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,6 +897,7 @@ class ExtendedCodegenModel extends CodegenModel {
897897
public boolean hasImports;
898898
public List<CodegenProperty> primitiveVars = new ArrayList<>();
899899
public List<CodegenProperty> complexVars = new ArrayList<>();
900+
public List<CodegenProperty> requiredPrimitiveVars = new ArrayList<>();
900901

901902
public ExtendedCodegenModel(CodegenModel cm) {
902903
super();
@@ -954,6 +955,9 @@ public ExtendedCodegenModel(CodegenModel cm) {
954955
for (CodegenProperty var : this.vars) {
955956
if (var.isPrimitiveType) {
956957
this.primitiveVars.add(var);
958+
if (var.required) {
959+
this.requiredPrimitiveVars.add(var);
960+
}
957961
} else {
958962
this.complexVars.add(var);
959963
}

modules/openapi-generator/src/main/resources/elixir/model.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
def new(params) do
2828
%__MODULE__{}
2929
|> Ecto.Changeset.cast(params, [{{#primitiveVars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/primitiveVars}}])
30-
|> Ecto.Changeset.validate_required([{{#primitiveVars}}{{#required}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/required}}{{/primitiveVars}}])
30+
|> Ecto.Changeset.validate_required([{{#requiredPrimitiveVars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/requiredPrimitiveVars}}])
3131
{{#complexVars}}
3232
|> Ecto.Changeset.cast_embed({{#atom}}{{&baseName}}{{/atom}}{{#required}}, required: true{{/required}})
3333
{{/complexVars}}

samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ defmodule OpenapiPetstore.Model.Animal do
2323
def new(params) do
2424
%__MODULE__{}
2525
|> Ecto.Changeset.cast(params, [:className, :color])
26-
|> Ecto.Changeset.validate_required([:className, ])
26+
|> Ecto.Changeset.validate_required([:className])
2727
|> Ecto.Changeset.apply_action!(:insert)
2828
end
2929
end

samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defmodule OpenapiPetstore.Model.Cat do
2525
def new(params) do
2626
%__MODULE__{}
2727
|> Ecto.Changeset.cast(params, [:className, :color, :declawed])
28-
|> Ecto.Changeset.validate_required([:className, ])
28+
|> Ecto.Changeset.validate_required([:className])
2929
|> Ecto.Changeset.apply_action!(:insert)
3030
end
3131
end

samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defmodule OpenapiPetstore.Model.Dog do
2525
def new(params) do
2626
%__MODULE__{}
2727
|> Ecto.Changeset.cast(params, [:className, :color, :breed])
28-
|> Ecto.Changeset.validate_required([:className, ])
28+
|> Ecto.Changeset.validate_required([:className])
2929
|> Ecto.Changeset.apply_action!(:insert)
3030
end
3131
end

samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ defmodule OpenapiPetstore.Model.EnumTest do
3535
def new(params) do
3636
%__MODULE__{}
3737
|> Ecto.Changeset.cast(params, [:enum_string, :enum_string_required, :enum_integer, :enum_number])
38-
|> Ecto.Changeset.validate_required([:enum_string_required, ])
38+
|> Ecto.Changeset.validate_required([:enum_string_required])
3939
|> Ecto.Changeset.cast_embed(:outerEnum)
4040
|> Ecto.Changeset.cast_embed(:outerEnumInteger)
4141
|> Ecto.Changeset.cast_embed(:outerEnumDefaultValue)

samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ defmodule OpenapiPetstore.Model.FormatTest do
5151
def new(params) do
5252
%__MODULE__{}
5353
|> Ecto.Changeset.cast(params, [:integer, :int32, :int64, :number, :float, :double, :decimal, :string, :byte, :binary, :date, :dateTime, :uuid, :password, :pattern_with_digits, :pattern_with_digits_and_delimiter])
54-
|> Ecto.Changeset.validate_required([:number, :byte, :date, :password, ])
54+
|> Ecto.Changeset.validate_required([:number, :byte, :date, :password])
5555
|> Ecto.Changeset.apply_action!(:insert)
5656
end
5757
end

samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ defmodule OpenapiPetstore.Model.Name do
2727
def new(params) do
2828
%__MODULE__{}
2929
|> Ecto.Changeset.cast(params, [:name, :snake_case, :property, :"123Number"])
30-
|> Ecto.Changeset.validate_required([:name, ])
30+
|> Ecto.Changeset.validate_required([:name])
3131
|> Ecto.Changeset.apply_action!(:insert)
3232
end
3333
end

samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ defmodule OpenapiPetstore.Model.Pet do
3131
def new(params) do
3232
%__MODULE__{}
3333
|> Ecto.Changeset.cast(params, [:id, :name, :photoUrls, :status])
34-
|> Ecto.Changeset.validate_required([:name, :photoUrls, ])
34+
|> Ecto.Changeset.validate_required([:name, :photoUrls])
3535
|> Ecto.Changeset.cast_embed(:category)
3636
|> Ecto.Changeset.cast_embed(:tags)
3737
|> Ecto.Changeset.apply_action!(:insert)

0 commit comments

Comments
 (0)