From 21a3b3acb98c8f39d357456a42e3292b8059c660 Mon Sep 17 00:00:00 2001 From: Hendrik Helmken Date: Tue, 7 Mar 2023 14:05:23 +0100 Subject: [PATCH] Use different order of arguments for json merge --- internal/test/any_of/param/param.gen.go | 8 +-- internal/test/components/components.gen.go | 70 +++++++++++----------- pkg/codegen/templates/union.tmpl | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/internal/test/any_of/param/param.gen.go b/internal/test/any_of/param/param.gen.go index 7de9459481..07dd59bca2 100644 --- a/internal/test/any_of/param/param.gen.go +++ b/internal/test/any_of/param/param.gen.go @@ -70,7 +70,7 @@ func (t *Test) MergeTest0(v Test0) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -96,7 +96,7 @@ func (t *Test) MergeTest1(v Test1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -132,7 +132,7 @@ func (t *Test2) MergeTest20(v Test20) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -158,7 +158,7 @@ func (t *Test2) MergeTest21(v Test21) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go index da630a8053..aaa076d8c5 100644 --- a/internal/test/components/components.gen.go +++ b/internal/test/components/components.gen.go @@ -817,7 +817,7 @@ func (t *AnyOfObject1) MergeOneOfVariant4(v OneOfVariant4) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -843,7 +843,7 @@ func (t *AnyOfObject1) MergeOneOfVariant5(v OneOfVariant5) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -879,7 +879,7 @@ func (t *OneOfObject1) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -905,7 +905,7 @@ func (t *OneOfObject1) MergeOneOfVariant2(v OneOfVariant2) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -931,7 +931,7 @@ func (t *OneOfObject1) MergeOneOfVariant3(v OneOfVariant3) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -967,7 +967,7 @@ func (t *OneOfObject10) MergeOneOfObject100(v OneOfObject100) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -993,7 +993,7 @@ func (t *OneOfObject10) MergeOneOfObject101(v OneOfObject101) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1091,7 +1091,7 @@ func (t *OneOfObject11_AdditionalProperties) MergeOneOfObject110(v OneOfObject11 return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1117,7 +1117,7 @@ func (t *OneOfObject11_AdditionalProperties) MergeOneOfObject111(v OneOfObject11 return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1143,7 +1143,7 @@ func (t *OneOfObject11_AdditionalProperties) MergeOneOfObject112(v OneOfObject11 return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1179,7 +1179,7 @@ func (t *OneOfObject12) MergeOneOfObject120(v OneOfObject120) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1205,7 +1205,7 @@ func (t *OneOfObject12) MergeOneOfObject121(v OneOfObject121) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1231,7 +1231,7 @@ func (t *OneOfObject12) MergeOneOfVariant3(v OneOfVariant3) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1257,7 +1257,7 @@ func (t *OneOfObject12) MergeOneOfVariant4(v OneOfVariant4) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1297,7 +1297,7 @@ func (t *OneOfObject13) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1327,7 +1327,7 @@ func (t *OneOfObject13) MergeOneOfVariant6(v OneOfVariant6) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1376,7 +1376,7 @@ func (t *OneOfObject2) MergeOneOfObject20(v OneOfObject20) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1402,7 +1402,7 @@ func (t *OneOfObject2) MergeOneOfObject21(v OneOfObject21) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1428,7 +1428,7 @@ func (t *OneOfObject2) MergeOneOfObject22(v OneOfObject22) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1464,7 +1464,7 @@ func (t *OneOfObject3_Union) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1490,7 +1490,7 @@ func (t *OneOfObject3_Union) MergeOneOfVariant2(v OneOfVariant2) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1516,7 +1516,7 @@ func (t *OneOfObject3_Union) MergeOneOfVariant3(v OneOfVariant3) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1552,7 +1552,7 @@ func (t *OneOfObject4) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1578,7 +1578,7 @@ func (t *OneOfObject4) MergeOneOfVariant2(v OneOfVariant2) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1604,7 +1604,7 @@ func (t *OneOfObject4) MergeOneOfVariant3(v OneOfVariant3) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1674,7 +1674,7 @@ func (t *OneOfObject5) MergeOneOfVariant4(v OneOfVariant4) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1700,7 +1700,7 @@ func (t *OneOfObject5) MergeOneOfVariant5(v OneOfVariant5) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1746,7 +1746,7 @@ func (t *OneOfObject6) MergeOneOfVariant4(v OneOfVariant4) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1774,7 +1774,7 @@ func (t *OneOfObject6) MergeOneOfVariant5(v OneOfVariant5) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1833,7 +1833,7 @@ func (t *OneOfObject7_Item) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1859,7 +1859,7 @@ func (t *OneOfObject7_Item) MergeOneOfVariant2(v OneOfVariant2) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1895,7 +1895,7 @@ func (t *OneOfObject8) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1921,7 +1921,7 @@ func (t *OneOfObject8) MergeOneOfVariant2(v OneOfVariant2) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -1995,7 +1995,7 @@ func (t *OneOfObject9) MergeOneOfVariant1(v OneOfVariant1) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } @@ -2025,7 +2025,7 @@ func (t *OneOfObject9) MergeOneOfVariant6(v OneOfVariant6) error { return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err } diff --git a/pkg/codegen/templates/union.tmpl b/pkg/codegen/templates/union.tmpl index 06c91f4f13..8bb34a2562 100644 --- a/pkg/codegen/templates/union.tmpl +++ b/pkg/codegen/templates/union.tmpl @@ -53,7 +53,7 @@ return err } - merged, err := runtime.JsonMerge(b, t.union) + merged, err := runtime.JsonMerge(t.union, b) t.union = merged return err }