From 80064d8411ed1b230f86b12a7552b99b2f66a086 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@users.noreply.github.com> Date: Fri, 22 Nov 2019 03:06:47 +0000 Subject: [PATCH] [CI][Swift4] improve swift ci integration (#4571) * [CI][swift] fix objcCompatible example * [swift4] [ci] build openapi-generator and update swift4 samples --- bin/swift4-petstore-objcCompatible.sh | 2 +- bin/swift4-test.sh | 2 +- bitrise.yml | 51 ++++++++ .../PetstoreClient.xcodeproj/project.pbxproj | 40 ++----- .../Classes/OpenAPIs/APIs/FakeAPI.swift | 83 ------------- .../Models/AdditionalPropertiesAnyType.swift | 53 --------- .../Models/AdditionalPropertiesArray.swift | 53 --------- .../Models/AdditionalPropertiesClass.swift | 29 +---- .../Models/AdditionalPropertiesInteger.swift | 53 --------- .../Models/AdditionalPropertiesNumber.swift | 53 --------- .../Models/AdditionalPropertiesObject.swift | 53 --------- .../Models/AdditionalPropertiesString.swift | 53 --------- .../Classes/OpenAPIs/Models/AnimalFarm.swift | 10 ++ .../Classes/OpenAPIs/Models/FormatTest.swift | 21 +--- .../Classes/OpenAPIs/Models/MapTest.swift | 4 +- ...esBoolean.swift => StringBooleanMap.swift} | 12 +- .../OpenAPIs/Models/TypeHolderExample.swift | 5 +- .../Classes/OpenAPIs/Models/XmlItem.swift | 106 ----------------- .../petstore/swift4/objcCompatible/README.md | 12 +- .../docs/AdditionalPropertiesClass.md | 9 -- .../swift4/objcCompatible/docs/AnimalFarm.md | 9 ++ .../swift4/objcCompatible/docs/FakeAPI.md | 109 ------------------ .../swift4/objcCompatible/docs/FormatTest.md | 1 - .../swift4/objcCompatible/docs/MapTest.md | 2 +- .../objcCompatible/docs/StringBooleanMap.md | 9 ++ .../objcCompatible/docs/TypeHolderExample.md | 1 - .../swift4/promisekitLibrary/Package.swift | 6 +- .../client/petstore/swift4/swift4_test_all.sh | 18 +-- samples/client/test/swift4/swift4_test_all.sh | 6 +- 29 files changed, 116 insertions(+), 749 deletions(-) create mode 100644 bitrise.yml delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift create mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift rename samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/{AdditionalPropertiesBoolean.swift => StringBooleanMap.swift} (72%) delete mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift create mode 100644 samples/client/petstore/swift4/objcCompatible/docs/AnimalFarm.md create mode 100644 samples/client/petstore/swift4/objcCompatible/docs/StringBooleanMap.md diff --git a/bin/swift4-petstore-objcCompatible.sh b/bin/swift4-petstore-objcCompatible.sh index 655d718fce6..e51278966b5 100755 --- a/bin/swift4-petstore-objcCompatible.sh +++ b/bin/swift4-petstore-objcCompatible.sh @@ -27,7 +27,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore-objcCompatible.json -o samples/client/petstore/swift4/objcCompatible $@" +ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore-objcCompatible.json -o samples/client/petstore/swift4/objcCompatible --generate-alias-as-model $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift4-test.sh b/bin/swift4-test.sh index 7bced643c41..800198acb5b 100755 --- a/bin/swift4-test.sh +++ b/bin/swift4-test.sh @@ -27,7 +27,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift4Test.json -g swift4 -c ./bin/swift4-test.json -o samples/client/test/swift4/default $@" +ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift/swift4Test.json -g swift4 -c ./bin/swift4-test.json -o samples/client/test/swift4/default --generate-alias-as-model $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bitrise.yml b/bitrise.yml new file mode 100644 index 00000000000..2e6aa860864 --- /dev/null +++ b/bitrise.yml @@ -0,0 +1,51 @@ +--- +format_version: '8' +default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git +project_type: other +trigger_map: +- push_branch: "*" + workflow: primary +- pull_request_source_branch: "*" + workflow: primary +workflows: + primary: + steps: + - git-clone@4.0.17: {} + - brew-install@0.10.2: + inputs: + - packages: maven + - script@1.1.5: + title: Install Cocoapods + inputs: + - content: | + #!/usr/bin/env bash + + sudo gem install cocoapods + - script@1.1.5: + inputs: + - content: | + #!/usr/bin/env bash + + set -e + + mvn package + title: Build openapi-generator + - script@1.1.5: + title: Update Swift4 samples + inputs: + - content: | + #!/usr/bin/env bash + + set -e + + sh bin/swift4-all.sh + - script@1.1.5: + inputs: + - content: | + #!/usr/bin/env bash + + set -e + + ./samples/client/petstore/swift4/swift4_test_all.sh && ./samples/client/test/swift4 && sh swift4_test_all.sh && exit ${PIPESTATUS[0]} + title: Run Swift4 tests + \ No newline at end of file diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj index 458c777c86e..b606fe1ab10 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 081C0B80A989B1AAF2665121 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7986861626C2B1CB49AD7000 /* MapTest.swift */; }; 0C1E4C682F2D0AF7D9E431EE /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C3E1129526A353B963EFD7 /* Dog.swift */; }; 0E6932F1C55BA6880693C478 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B2E9EF856E89FEAA359A3A /* Order.swift */; }; - 1A3562EDD07FF7D64BCD7A59 /* AdditionalPropertiesObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72FEDC94BA0E37214D360871 /* AdditionalPropertiesObject.swift */; }; 1E6C7C7F271A802DF8099330 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897716962D472FE162B723CB /* APIHelper.swift */; }; 22FA6CA58E58550DE36AE750 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9791B840B8D6EAA35343B00F /* JSONEncodableEncoding.swift */; }; 248F2F0F29E8FDAE9CAD64C5 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DEF3156BA0D12D0FC5C3C /* AdditionalPropertiesClass.swift */; }; @@ -23,12 +22,11 @@ 34C26979F4678B5B579D26E8 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42354B407EC173BEB54E042 /* FakeClassnameTags123API.swift */; }; 3691B017D3AA18404A563C67 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65BB72353DA24536A9049BE /* ArrayOfNumberOnly.swift */; }; 37DEADD6CD0496690725B8A7 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD994DFAA0DA93C188A4DBA /* Name.swift */; }; - 3EA765BDC5A11401D8A16536 /* XmlItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2253391845B73B8BA368049 /* XmlItem.swift */; }; 40E3027D2E38D8329C6AB01F /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DF825B8F3BADA2B2537D17 /* APIs.swift */; }; 40E46046D2B16D1A672A08E3 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A201508DF2B697D65F2631 /* AlamofireImplementations.swift */; }; 418DB36F23C53C6E2C3CDE39 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A235FA3FDFB086CC69CDE83D /* Alamofire.framework */; }; 41A491E9B577C510F927D126 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15008AABC804EB6FB4CDAC6 /* OuterEnum.swift */; }; - 4884A65ABBA468278D2450FD /* AdditionalPropertiesString.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFE215C1B526E0418ED301B1 /* AdditionalPropertiesString.swift */; }; + 45B3B29D7A62049F824751F8 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D22BE01748F51106DE02332 /* AnimalFarm.swift */; }; 4A344DF7ECE721B4BBEDCB4A /* CatAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD0F94F512DFBC09F9CC79A /* CatAllOf.swift */; }; 4B4BE77747413A9188CDABD2 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1B8B838B5D9D312F2002EB /* ArrayOfArrayOfNumberOnly.swift */; }; 555DEA47352B42E49082922B /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8E0B16084741FCB82389F58 /* NumberOnly.swift */; }; @@ -37,13 +35,10 @@ 64C48E3658CF53EBE8AF82F9 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8D5F382979854D47F18DB1 /* UserAPI.swift */; }; 6B638A04B34C82B2091D6EDD /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3156CE41C001C80379B84BDB /* FormatTest.swift */; }; 6FBD978F4D1ED92E7071FFBB /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A6F6BB2152ACEE1416D44A /* CodableHelper.swift */; }; - 7244DA68425DE3B3727C1990 /* AdditionalPropertiesNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0512B3582586B4C0C598D5 /* AdditionalPropertiesNumber.swift */; }; 72547ECFB451A509409311EE /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28A444949BBC254798C3B3DD /* Configuration.swift */; }; 72CE544C52BB33778D1B89B8 /* DogAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21A69C8402A60E01116ABBD /* DogAllOf.swift */; }; 7441BBA84C31E06400338F89 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30827D8EAF8EA684E7BCEA /* ClassModel.swift */; }; 7588B7E2960253174ADCCF16 /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D710108A69DD8A5297F926 /* JSONEncodingHelper.swift */; }; - 7F7BE063B514EF4A90D75B7F /* AdditionalPropertiesInteger.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2F3566156A4ABC465F201B /* AdditionalPropertiesInteger.swift */; }; - 83BBA452D761D61542F297CC /* AdditionalPropertiesArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEE553331890581C2FF366F /* AdditionalPropertiesArray.swift */; }; 86DE714469BE8BA28AFF710F /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FBC641752D2E13B150973 /* HasOnlyReadOnly.swift */; }; 914F4D1FCB17773C067C4E68 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FD42727E001E799E458C292 /* ReadOnlyFirst.swift */; }; 922BDADAB291907A7FD14314 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E0AD8F60A91F72C7687560 /* OuterComposite.swift */; }; @@ -54,7 +49,6 @@ A6E50CC6845FE58D8C236253 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81447828475F76C5CF4F08A /* Return.swift */; }; A6E5A5629495DB0ED672B06F /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A019F500E546A3292CE716A /* PetAPI.swift */; }; A85E190556818FFA79896E92 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A0379CDFC55705AE76C998 /* ArrayTest.swift */; }; - AB3B26F5E373BC8C0A0A617E /* AdditionalPropertiesAnyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5AB1037D937AADF8B4A70C9 /* AdditionalPropertiesAnyType.swift */; }; ACF3037926301D4D6E848745 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C97AE6ACA1E5FB88F5BAA /* EnumClass.swift */; }; AD594BFB99E31A5E07579237 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A913A57E72D723632E9A718F /* Client.swift */; }; B301DB1B80F37C757550AA17 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD714C7CC59BDD18DE8DF4E /* MixedPropertiesAndAdditionalPropertiesClass.swift */; }; @@ -67,17 +61,15 @@ DDBD4C0FBA3CD6A4DA3DF376 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E00950725DC44436C5E238C /* FakeAPI.swift */; }; DDF1D589267D56D9BED3C6E5 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3666552AA854DAF9C480A3 /* FileSchemaTestClass.swift */; }; E8A58C6414E88AF3EAE45B69 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2985D01F8D60A4B1925C69 /* Category.swift */; }; - EF35D2C67E3BC377DDCC99CB /* AdditionalPropertiesBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC24C01A55F644957196F9F /* AdditionalPropertiesBoolean.swift */; }; + EDFC6C5121A43997014049CB /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DEBABEFE140768CFB70B /* StringBooleanMap.swift */; }; FECA2E8C9D0BDFEC459E8996 /* TypeHolderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B65C66C97F082718DDD703 /* TypeHolderExample.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 02A6F6BB2152ACEE1416D44A /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = ""; }; - 0CC24C01A55F644957196F9F /* AdditionalPropertiesBoolean.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesBoolean.swift; sourceTree = ""; }; 10503995D9EFD031A2EFB576 /* EnumArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = ""; }; 164AD6EC9C4CCF634D7C4590 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 19B65C66C97F082718DDD703 /* TypeHolderExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderExample.swift; sourceTree = ""; }; - 1E0512B3582586B4C0C598D5 /* AdditionalPropertiesNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesNumber.swift; sourceTree = ""; }; 212AA914B7F1793A4E32C119 /* Cat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = ""; }; 27B2E9EF856E89FEAA359A3A /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = ""; }; 28A444949BBC254798C3B3DD /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = ""; }; @@ -89,15 +81,14 @@ 396DEF3156BA0D12D0FC5C3C /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = ""; }; 3AD0F94F512DFBC09F9CC79A /* CatAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatAllOf.swift; sourceTree = ""; }; 3C30827D8EAF8EA684E7BCEA /* ClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = ""; }; + 47B4DEBABEFE140768CFB70B /* StringBooleanMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = ""; }; 4B2C97AE6ACA1E5FB88F5BAA /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = ""; }; 4B3666552AA854DAF9C480A3 /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = ""; }; 4C7FBC641752D2E13B150973 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = ""; }; - 4FEE553331890581C2FF366F /* AdditionalPropertiesArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesArray.swift; sourceTree = ""; }; 5AD994DFAA0DA93C188A4DBA /* Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = ""; }; 6E00950725DC44436C5E238C /* FakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = ""; }; 6F2985D01F8D60A4B1925C69 /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = ""; }; 6FD42727E001E799E458C292 /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = ""; }; - 72FEDC94BA0E37214D360871 /* AdditionalPropertiesObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesObject.swift; sourceTree = ""; }; 7986861626C2B1CB49AD7000 /* MapTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = ""; }; 7A6070F581E611FF44AFD40A /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = ""; }; 7B1B8B838B5D9D312F2002EB /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = ""; }; @@ -106,13 +97,13 @@ 84A201508DF2B697D65F2631 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = ""; }; 8699F7966F748ED026A6FB4C /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = ""; }; 897716962D472FE162B723CB /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = ""; }; + 8D22BE01748F51106DE02332 /* AnimalFarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = ""; }; 95568E7C35F119EB4A12B498 /* Animal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = ""; }; 9791B840B8D6EAA35343B00F /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = ""; }; 9A019F500E546A3292CE716A /* PetAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = ""; }; 9AD714C7CC59BDD18DE8DF4E /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = ""; }; 9DF24D2714B9C4CF14146E88 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = ""; }; A21A69C8402A60E01116ABBD /* DogAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogAllOf.swift; sourceTree = ""; }; - A2253391845B73B8BA368049 /* XmlItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XmlItem.swift; sourceTree = ""; }; A235FA3FDFB086CC69CDE83D /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = ""; }; A53274D99BBDE1B79BF3521C /* StoreAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = ""; }; A7B38FA00A494D13F4C382A3 /* Capitalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = ""; }; @@ -131,10 +122,7 @@ ECFEB4C6C257B3BB3CEA36D1 /* Pet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = ""; }; F1A0379CDFC55705AE76C998 /* ArrayTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = ""; }; F4E0AD8F60A91F72C7687560 /* OuterComposite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = ""; }; - F5AB1037D937AADF8B4A70C9 /* AdditionalPropertiesAnyType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesAnyType.swift; sourceTree = ""; }; - FA2F3566156A4ABC465F201B /* AdditionalPropertiesInteger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesInteger.swift; sourceTree = ""; }; FD60AEA646791E0EDE885DE1 /* EnumTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = ""; }; - FFE215C1B526E0418ED301B1 /* AdditionalPropertiesString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesString.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -160,15 +148,9 @@ 4FBDCF1330A9AB9122780DB3 /* Models */ = { isa = PBXGroup; children = ( - F5AB1037D937AADF8B4A70C9 /* AdditionalPropertiesAnyType.swift */, - 4FEE553331890581C2FF366F /* AdditionalPropertiesArray.swift */, - 0CC24C01A55F644957196F9F /* AdditionalPropertiesBoolean.swift */, 396DEF3156BA0D12D0FC5C3C /* AdditionalPropertiesClass.swift */, - FA2F3566156A4ABC465F201B /* AdditionalPropertiesInteger.swift */, - 1E0512B3582586B4C0C598D5 /* AdditionalPropertiesNumber.swift */, - 72FEDC94BA0E37214D360871 /* AdditionalPropertiesObject.swift */, - FFE215C1B526E0418ED301B1 /* AdditionalPropertiesString.swift */, 95568E7C35F119EB4A12B498 /* Animal.swift */, + 8D22BE01748F51106DE02332 /* AnimalFarm.swift */, A8E7B833748B4F0C7CDA90C6 /* ApiResponse.swift */, 7B1B8B838B5D9D312F2002EB /* ArrayOfArrayOfNumberOnly.swift */, B65BB72353DA24536A9049BE /* ArrayOfNumberOnly.swift */, @@ -201,11 +183,11 @@ 6FD42727E001E799E458C292 /* ReadOnlyFirst.swift */, C81447828475F76C5CF4F08A /* Return.swift */, 386FD590658E90509C121118 /* SpecialModelName.swift */, + 47B4DEBABEFE140768CFB70B /* StringBooleanMap.swift */, B2896F8BFD1AA2965C8A3015 /* Tag.swift */, EBC76F6D4D2AA8084B7EB50E /* TypeHolderDefault.swift */, 19B65C66C97F082718DDD703 /* TypeHolderExample.swift */, E5565A447062C7B8F695F451 /* User.swift */, - A2253391845B73B8BA368049 /* XmlItem.swift */, ); path = Models; sourceTree = ""; @@ -342,16 +324,10 @@ files = ( 1E6C7C7F271A802DF8099330 /* APIHelper.swift in Sources */, 40E3027D2E38D8329C6AB01F /* APIs.swift in Sources */, - AB3B26F5E373BC8C0A0A617E /* AdditionalPropertiesAnyType.swift in Sources */, - 83BBA452D761D61542F297CC /* AdditionalPropertiesArray.swift in Sources */, - EF35D2C67E3BC377DDCC99CB /* AdditionalPropertiesBoolean.swift in Sources */, 248F2F0F29E8FDAE9CAD64C5 /* AdditionalPropertiesClass.swift in Sources */, - 7F7BE063B514EF4A90D75B7F /* AdditionalPropertiesInteger.swift in Sources */, - 7244DA68425DE3B3727C1990 /* AdditionalPropertiesNumber.swift in Sources */, - 1A3562EDD07FF7D64BCD7A59 /* AdditionalPropertiesObject.swift in Sources */, - 4884A65ABBA468278D2450FD /* AdditionalPropertiesString.swift in Sources */, 40E46046D2B16D1A672A08E3 /* AlamofireImplementations.swift in Sources */, 2B441CDFFFDDB343C04F5375 /* Animal.swift in Sources */, + 45B3B29D7A62049F824751F8 /* AnimalFarm.swift in Sources */, CA9B9B19882EA044EAD0B359 /* AnotherFakeAPI.swift in Sources */, 0299339D13C3571C4C57368A /* ApiResponse.swift in Sources */, 4B4BE77747413A9188CDABD2 /* ArrayOfArrayOfNumberOnly.swift in Sources */, @@ -395,12 +371,12 @@ A6E50CC6845FE58D8C236253 /* Return.swift in Sources */, 294CDFA409BC369C0FDC5FB3 /* SpecialModelName.swift in Sources */, CB68ABDBAADAF6B8D7B93A5D /* StoreAPI.swift in Sources */, + EDFC6C5121A43997014049CB /* StringBooleanMap.swift in Sources */, B3E35FE2773D4A8BA15CFA88 /* Tag.swift in Sources */, 5695497F5DBF6C08842755A3 /* TypeHolderDefault.swift in Sources */, FECA2E8C9D0BDFEC459E8996 /* TypeHolderExample.swift in Sources */, 31DFF71D8CCCA0D2D2F8AC90 /* User.swift in Sources */, 64C48E3658CF53EBE8AF82F9 /* UserAPI.swift in Sources */, - 3EA765BDC5A11401D8A16536 /* XmlItem.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift index 583c6ead867..d1f658b08d8 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift @@ -9,41 +9,6 @@ import Foundation import Alamofire open class FakeAPI { - /** - creates an XmlItem - - - parameter xmlItem: (body) XmlItem Body - - parameter completion: completion handler to receive the data and the error objects - */ - open class func createXmlItem(xmlItem: XmlItem, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) { - createXmlItemWithRequestBuilder(xmlItem: xmlItem).execute { (_, error) -> Void in - if error == nil { - completion((), error) - } else { - completion(nil, error) - } - } - } - - /** - creates an XmlItem - - POST /fake/create_xml_item - - this route creates an XmlItem - - parameter xmlItem: (body) XmlItem Body - - returns: RequestBuilder - */ - open class func createXmlItemWithRequestBuilder(xmlItem: XmlItem) -> RequestBuilder { - let path = "/fake/create_xml_item" - let URLString = PetstoreClientAPI.basePath + path - let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: xmlItem) - - let url = URLComponents(string: URLString) - - let requestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() - - return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true) - } - /** - parameter body: (body) Input boolean as post body (optional) @@ -608,52 +573,4 @@ open class FakeAPI { return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false) } - /** - - - parameter pipe: (query) - - parameter ioutil: (query) - - parameter http: (query) - - parameter url: (query) - - parameter context: (query) - - parameter completion: completion handler to receive the data and the error objects - */ - open class func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) { - testQueryParameterCollectionFormatWithRequestBuilder(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context).execute { (_, error) -> Void in - if error == nil { - completion((), error) - } else { - completion(nil, error) - } - } - } - - /** - - PUT /fake/test-query-paramters - - To test the collection format in query parameters - - parameter pipe: (query) - - parameter ioutil: (query) - - parameter http: (query) - - parameter url: (query) - - parameter context: (query) - - returns: RequestBuilder - */ - open class func testQueryParameterCollectionFormatWithRequestBuilder(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String]) -> RequestBuilder { - let path = "/fake/test-query-paramters" - let URLString = PetstoreClientAPI.basePath + path - let parameters: [String: Any]? = nil - - var url = URLComponents(string: URLString) - url?.queryItems = APIHelper.mapValuesToQueryItems([ - "pipe": pipe, - "ioutil": ioutil, - "http": http, - "url": url, - "context": context - ]) - - let requestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder() - - return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false) - } - } diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift deleted file mode 100644 index 94295c495c5..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AdditionalPropertiesAnyType.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct AdditionalPropertiesAnyType: Codable { - - public var name: String? - - public init(name: String?) { - self.name = name - } - public var additionalProperties: [String: Any] = [:] - - public subscript(key: String) -> Any? { - get { - if let value = additionalProperties[key] { - return value - } - return nil - } - - set { - additionalProperties[key] = newValue - } - } - - // Encodable protocol methods - - public func encode(to encoder: Encoder) throws { - - var container = encoder.container(keyedBy: String.self) - - try container.encodeIfPresent(name, forKey: "name") - try container.encodeMap(additionalProperties) - } - - // Decodable protocol methods - - public init(from decoder: Decoder) throws { - let container = try decoder.container(keyedBy: String.self) - - name = try container.decodeIfPresent(String.self, forKey: "name") - var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") - additionalProperties = try container.decodeMap(Any.self, excludedKeys: nonAdditionalPropertyKeys) - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift deleted file mode 100644 index cde9824ddb3..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AdditionalPropertiesArray.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct AdditionalPropertiesArray: Codable { - - public var name: String? - - public init(name: String?) { - self.name = name - } - public var additionalProperties: [String: Array] = [:] - - public subscript(key: String) -> Array? { - get { - if let value = additionalProperties[key] { - return value - } - return nil - } - - set { - additionalProperties[key] = newValue - } - } - - // Encodable protocol methods - - public func encode(to encoder: Encoder) throws { - - var container = encoder.container(keyedBy: String.self) - - try container.encodeIfPresent(name, forKey: "name") - try container.encodeMap(additionalProperties) - } - - // Decodable protocol methods - - public init(from decoder: Decoder) throws { - let container = try decoder.container(keyedBy: String.self) - - name = try container.decodeIfPresent(String.self, forKey: "name") - var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") - additionalProperties = try container.decodeMap(Array.self, excludedKeys: nonAdditionalPropertyKeys) - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift index a4e11337fb7..83a06951ccd 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift @@ -10,43 +10,16 @@ import Foundation public struct AdditionalPropertiesClass: Codable { public var mapString: [String: String]? - public var mapNumber: [String: Double]? - public var mapInteger: [String: Int]? - public var mapBoolean: [String: Bool]? - public var mapArrayInteger: [String: [Int]]? - public var mapArrayAnytype: [String: [Any]]? public var mapMapString: [String: [String: String]]? - public var mapMapAnytype: [String: [String: Any]]? - public var anytype1: Any? - public var anytype2: Any? - public var anytype3: Any? - public init(mapString: [String: String]?, mapNumber: [String: Double]?, mapInteger: [String: Int]?, mapBoolean: [String: Bool]?, mapArrayInteger: [String: [Int]]?, mapArrayAnytype: [String: [Any]]?, mapMapString: [String: [String: String]]?, mapMapAnytype: [String: [String: Any]]?, anytype1: Any?, anytype2: Any?, anytype3: Any?) { + public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) { self.mapString = mapString - self.mapNumber = mapNumber - self.mapInteger = mapInteger - self.mapBoolean = mapBoolean - self.mapArrayInteger = mapArrayInteger - self.mapArrayAnytype = mapArrayAnytype self.mapMapString = mapMapString - self.mapMapAnytype = mapMapAnytype - self.anytype1 = anytype1 - self.anytype2 = anytype2 - self.anytype3 = anytype3 } public enum CodingKeys: String, CodingKey { case mapString = "map_string" - case mapNumber = "map_number" - case mapInteger = "map_integer" - case mapBoolean = "map_boolean" - case mapArrayInteger = "map_array_integer" - case mapArrayAnytype = "map_array_anytype" case mapMapString = "map_map_string" - case mapMapAnytype = "map_map_anytype" - case anytype1 = "anytype_1" - case anytype2 = "anytype_2" - case anytype3 = "anytype_3" } } diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift deleted file mode 100644 index 4a0f2acaa41..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AdditionalPropertiesInteger.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct AdditionalPropertiesInteger: Codable { - - public var name: String? - - public init(name: String?) { - self.name = name - } - public var additionalProperties: [String: Int] = [:] - - public subscript(key: String) -> Int? { - get { - if let value = additionalProperties[key] { - return value - } - return nil - } - - set { - additionalProperties[key] = newValue - } - } - - // Encodable protocol methods - - public func encode(to encoder: Encoder) throws { - - var container = encoder.container(keyedBy: String.self) - - try container.encodeIfPresent(name, forKey: "name") - try container.encodeMap(additionalProperties) - } - - // Decodable protocol methods - - public init(from decoder: Decoder) throws { - let container = try decoder.container(keyedBy: String.self) - - name = try container.decodeIfPresent(String.self, forKey: "name") - var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") - additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys) - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift deleted file mode 100644 index 95e491000ab..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AdditionalPropertiesNumber.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct AdditionalPropertiesNumber: Codable { - - public var name: String? - - public init(name: String?) { - self.name = name - } - public var additionalProperties: [String: Double] = [:] - - public subscript(key: String) -> Double? { - get { - if let value = additionalProperties[key] { - return value - } - return nil - } - - set { - additionalProperties[key] = newValue - } - } - - // Encodable protocol methods - - public func encode(to encoder: Encoder) throws { - - var container = encoder.container(keyedBy: String.self) - - try container.encodeIfPresent(name, forKey: "name") - try container.encodeMap(additionalProperties) - } - - // Decodable protocol methods - - public init(from decoder: Decoder) throws { - let container = try decoder.container(keyedBy: String.self) - - name = try container.decodeIfPresent(String.self, forKey: "name") - var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") - additionalProperties = try container.decodeMap(Double.self, excludedKeys: nonAdditionalPropertyKeys) - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift deleted file mode 100644 index f45888a4101..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AdditionalPropertiesObject.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct AdditionalPropertiesObject: Codable { - - public var name: String? - - public init(name: String?) { - self.name = name - } - public var additionalProperties: [String: Dictionary] = [:] - - public subscript(key: String) -> Dictionary? { - get { - if let value = additionalProperties[key] { - return value - } - return nil - } - - set { - additionalProperties[key] = newValue - } - } - - // Encodable protocol methods - - public func encode(to encoder: Encoder) throws { - - var container = encoder.container(keyedBy: String.self) - - try container.encodeIfPresent(name, forKey: "name") - try container.encodeMap(additionalProperties) - } - - // Decodable protocol methods - - public init(from decoder: Decoder) throws { - let container = try decoder.container(keyedBy: String.self) - - name = try container.decodeIfPresent(String.self, forKey: "name") - var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") - additionalProperties = try container.decodeMap(Dictionary.self, excludedKeys: nonAdditionalPropertyKeys) - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift deleted file mode 100644 index 7af63cc7152..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AdditionalPropertiesString.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct AdditionalPropertiesString: Codable { - - public var name: String? - - public init(name: String?) { - self.name = name - } - public var additionalProperties: [String: String] = [:] - - public subscript(key: String) -> String? { - get { - if let value = additionalProperties[key] { - return value - } - return nil - } - - set { - additionalProperties[key] = newValue - } - } - - // Encodable protocol methods - - public func encode(to encoder: Encoder) throws { - - var container = encoder.container(keyedBy: String.self) - - try container.encodeIfPresent(name, forKey: "name") - try container.encodeMap(additionalProperties) - } - - // Decodable protocol methods - - public init(from decoder: Decoder) throws { - let container = try decoder.container(keyedBy: String.self) - - name = try container.decodeIfPresent(String.self, forKey: "name") - var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") - additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys) - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift new file mode 100644 index 00000000000..e09b0e9efdc --- /dev/null +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -0,0 +1,10 @@ +// +// AnimalFarm.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +public typealias AnimalFarm = [Animal] diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift index c1987c40880..20bd6d103b3 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift @@ -22,9 +22,8 @@ public struct FormatTest: Codable { public var dateTime: Date? public var uuid: UUID? public var password: String - public var bigDecimal: Decimal? - public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: URL?, date: Date, dateTime: Date?, uuid: UUID?, password: String, bigDecimal: Decimal?) { + public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: URL?, date: Date, dateTime: Date?, uuid: UUID?, password: String) { self.integer = integer self.int32 = int32 self.int64 = int64 @@ -38,24 +37,6 @@ public struct FormatTest: Codable { self.dateTime = dateTime self.uuid = uuid self.password = password - self.bigDecimal = bigDecimal - } - - public enum CodingKeys: String, CodingKey { - case integer - case int32 - case int64 - case number - case float - case double - case string - case byte - case binary - case date - case dateTime - case uuid - case password - case bigDecimal = "BigDecimal" } } diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift index 358ca7a58d1..3a10a7dfcaf 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift @@ -16,9 +16,9 @@ public struct MapTest: Codable { public var mapMapOfString: [String: [String: String]]? public var mapOfEnumString: [String: String]? public var directMap: [String: Bool]? - public var indirectMap: [String: Bool]? + public var indirectMap: StringBooleanMap? - public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: [String: Bool]?) { + public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) { self.mapMapOfString = mapMapOfString self.mapOfEnumString = mapOfEnumString self.directMap = directMap diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift similarity index 72% rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift rename to samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift index 76791a9ddd3..3f1237fee47 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift @@ -1,5 +1,5 @@ // -// AdditionalPropertiesBoolean.swift +// StringBooleanMap.swift // // Generated by openapi-generator // https://openapi-generator.tech @@ -7,13 +7,8 @@ import Foundation -public struct AdditionalPropertiesBoolean: Codable { +public struct StringBooleanMap: Codable { - public var name: String? - - public init(name: String?) { - self.name = name - } public var additionalProperties: [String: Bool] = [:] public subscript(key: String) -> Bool? { @@ -35,7 +30,6 @@ public struct AdditionalPropertiesBoolean: Codable { var container = encoder.container(keyedBy: String.self) - try container.encodeIfPresent(name, forKey: "name") try container.encodeMap(additionalProperties) } @@ -44,9 +38,7 @@ public struct AdditionalPropertiesBoolean: Codable { public init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: String.self) - name = try container.decodeIfPresent(String.self, forKey: "name") var nonAdditionalPropertyKeys = Set() - nonAdditionalPropertyKeys.insert("name") additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys) } diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift index f51714718f8..602a2a6d185 100644 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift +++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift @@ -11,15 +11,13 @@ public struct TypeHolderExample: Codable { public var stringItem: String public var numberItem: Double - public var floatItem: Float public var integerItem: Int public var boolItem: Bool public var arrayItem: [Int] - public init(stringItem: String, numberItem: Double, floatItem: Float, integerItem: Int, boolItem: Bool, arrayItem: [Int]) { + public init(stringItem: String, numberItem: Double, integerItem: Int, boolItem: Bool, arrayItem: [Int]) { self.stringItem = stringItem self.numberItem = numberItem - self.floatItem = floatItem self.integerItem = integerItem self.boolItem = boolItem self.arrayItem = arrayItem @@ -28,7 +26,6 @@ public struct TypeHolderExample: Codable { public enum CodingKeys: String, CodingKey { case stringItem = "string_item" case numberItem = "number_item" - case floatItem = "float_item" case integerItem = "integer_item" case boolItem = "bool_item" case arrayItem = "array_item" diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift deleted file mode 100644 index aa016683503..00000000000 --- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift +++ /dev/null @@ -1,106 +0,0 @@ -// -// XmlItem.swift -// -// Generated by openapi-generator -// https://openapi-generator.tech -// - -import Foundation - -public struct XmlItem: Codable { - - public var attributeString: String? - public var attributeNumber: Double? - public var attributeInteger: Int? - public var attributeBoolean: Bool? - public var wrappedArray: [Int]? - public var nameString: String? - public var nameNumber: Double? - public var nameInteger: Int? - public var nameBoolean: Bool? - public var nameArray: [Int]? - public var nameWrappedArray: [Int]? - public var prefixString: String? - public var prefixNumber: Double? - public var prefixInteger: Int? - public var prefixBoolean: Bool? - public var prefixArray: [Int]? - public var prefixWrappedArray: [Int]? - public var namespaceString: String? - public var namespaceNumber: Double? - public var namespaceInteger: Int? - public var namespaceBoolean: Bool? - public var namespaceArray: [Int]? - public var namespaceWrappedArray: [Int]? - public var prefixNsString: String? - public var prefixNsNumber: Double? - public var prefixNsInteger: Int? - public var prefixNsBoolean: Bool? - public var prefixNsArray: [Int]? - public var prefixNsWrappedArray: [Int]? - - public init(attributeString: String?, attributeNumber: Double?, attributeInteger: Int?, attributeBoolean: Bool?, wrappedArray: [Int]?, nameString: String?, nameNumber: Double?, nameInteger: Int?, nameBoolean: Bool?, nameArray: [Int]?, nameWrappedArray: [Int]?, prefixString: String?, prefixNumber: Double?, prefixInteger: Int?, prefixBoolean: Bool?, prefixArray: [Int]?, prefixWrappedArray: [Int]?, namespaceString: String?, namespaceNumber: Double?, namespaceInteger: Int?, namespaceBoolean: Bool?, namespaceArray: [Int]?, namespaceWrappedArray: [Int]?, prefixNsString: String?, prefixNsNumber: Double?, prefixNsInteger: Int?, prefixNsBoolean: Bool?, prefixNsArray: [Int]?, prefixNsWrappedArray: [Int]?) { - self.attributeString = attributeString - self.attributeNumber = attributeNumber - self.attributeInteger = attributeInteger - self.attributeBoolean = attributeBoolean - self.wrappedArray = wrappedArray - self.nameString = nameString - self.nameNumber = nameNumber - self.nameInteger = nameInteger - self.nameBoolean = nameBoolean - self.nameArray = nameArray - self.nameWrappedArray = nameWrappedArray - self.prefixString = prefixString - self.prefixNumber = prefixNumber - self.prefixInteger = prefixInteger - self.prefixBoolean = prefixBoolean - self.prefixArray = prefixArray - self.prefixWrappedArray = prefixWrappedArray - self.namespaceString = namespaceString - self.namespaceNumber = namespaceNumber - self.namespaceInteger = namespaceInteger - self.namespaceBoolean = namespaceBoolean - self.namespaceArray = namespaceArray - self.namespaceWrappedArray = namespaceWrappedArray - self.prefixNsString = prefixNsString - self.prefixNsNumber = prefixNsNumber - self.prefixNsInteger = prefixNsInteger - self.prefixNsBoolean = prefixNsBoolean - self.prefixNsArray = prefixNsArray - self.prefixNsWrappedArray = prefixNsWrappedArray - } - - public enum CodingKeys: String, CodingKey { - case attributeString = "attribute_string" - case attributeNumber = "attribute_number" - case attributeInteger = "attribute_integer" - case attributeBoolean = "attribute_boolean" - case wrappedArray = "wrapped_array" - case nameString = "name_string" - case nameNumber = "name_number" - case nameInteger = "name_integer" - case nameBoolean = "name_boolean" - case nameArray = "name_array" - case nameWrappedArray = "name_wrapped_array" - case prefixString = "prefix_string" - case prefixNumber = "prefix_number" - case prefixInteger = "prefix_integer" - case prefixBoolean = "prefix_boolean" - case prefixArray = "prefix_array" - case prefixWrappedArray = "prefix_wrapped_array" - case namespaceString = "namespace_string" - case namespaceNumber = "namespace_number" - case namespaceInteger = "namespace_integer" - case namespaceBoolean = "namespace_boolean" - case namespaceArray = "namespace_array" - case namespaceWrappedArray = "namespace_wrapped_array" - case prefixNsString = "prefix_ns_string" - case prefixNsNumber = "prefix_ns_number" - case prefixNsInteger = "prefix_ns_integer" - case prefixNsBoolean = "prefix_ns_boolean" - case prefixNsArray = "prefix_ns_array" - case prefixNsWrappedArray = "prefix_ns_wrapped_array" - } - -} diff --git a/samples/client/petstore/swift4/objcCompatible/README.md b/samples/client/petstore/swift4/objcCompatible/README.md index a5a86abe0a1..0711eb87054 100644 --- a/samples/client/petstore/swift4/objcCompatible/README.md +++ b/samples/client/petstore/swift4/objcCompatible/README.md @@ -26,7 +26,6 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- *AnotherFakeAPI* | [**call123testSpecialTags**](docs/AnotherFakeAPI.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags -*FakeAPI* | [**createXmlItem**](docs/FakeAPI.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem *FakeAPI* | [**fakeOuterBooleanSerialize**](docs/FakeAPI.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeAPI* | [**fakeOuterCompositeSerialize**](docs/FakeAPI.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | *FakeAPI* | [**fakeOuterNumberSerialize**](docs/FakeAPI.md#fakeouternumberserialize) | **POST** /fake/outer/number | @@ -39,7 +38,6 @@ Class | Method | HTTP request | Description *FakeAPI* | [**testGroupParameters**](docs/FakeAPI.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional) *FakeAPI* | [**testInlineAdditionalProperties**](docs/FakeAPI.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties *FakeAPI* | [**testJsonFormData**](docs/FakeAPI.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data -*FakeAPI* | [**testQueryParameterCollectionFormat**](docs/FakeAPI.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-paramters | *FakeClassnameTags123API* | [**testClassname**](docs/FakeClassnameTags123API.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case *PetAPI* | [**addPet**](docs/PetAPI.md#addpet) | **POST** /pet | Add a new pet to the store *PetAPI* | [**deletePet**](docs/PetAPI.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet @@ -66,15 +64,9 @@ Class | Method | HTTP request | Description ## Documentation For Models - - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md) - - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md) - - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md) - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md) - - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md) - - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md) - - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md) - - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md) - [Animal](docs/Animal.md) + - [AnimalFarm](docs/AnimalFarm.md) - [ApiResponse](docs/ApiResponse.md) - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) @@ -107,11 +99,11 @@ Class | Method | HTTP request | Description - [ReadOnlyFirst](docs/ReadOnlyFirst.md) - [Return](docs/Return.md) - [SpecialModelName](docs/SpecialModelName.md) + - [StringBooleanMap](docs/StringBooleanMap.md) - [Tag](docs/Tag.md) - [TypeHolderDefault](docs/TypeHolderDefault.md) - [TypeHolderExample](docs/TypeHolderExample.md) - [User](docs/User.md) - - [XmlItem](docs/XmlItem.md) ## Documentation For Authorization diff --git a/samples/client/petstore/swift4/objcCompatible/docs/AdditionalPropertiesClass.md b/samples/client/petstore/swift4/objcCompatible/docs/AdditionalPropertiesClass.md index f7fbe1ab796..e22d28be1de 100644 --- a/samples/client/petstore/swift4/objcCompatible/docs/AdditionalPropertiesClass.md +++ b/samples/client/petstore/swift4/objcCompatible/docs/AdditionalPropertiesClass.md @@ -4,16 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **mapString** | **[String:String]** | | [optional] -**mapNumber** | **[String:Double]** | | [optional] -**mapInteger** | **[String:Int]** | | [optional] -**mapBoolean** | **[String:Bool]** | | [optional] -**mapArrayInteger** | [String:[Int]] | | [optional] -**mapArrayAnytype** | [String:[Any]] | | [optional] **mapMapString** | [String:[String:String]] | | [optional] -**mapMapAnytype** | [String:[String:Any]] | | [optional] -**anytype1** | [**Any**](.md) | | [optional] -**anytype2** | [**Any**](.md) | | [optional] -**anytype3** | [**Any**](.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/swift4/objcCompatible/docs/AnimalFarm.md b/samples/client/petstore/swift4/objcCompatible/docs/AnimalFarm.md new file mode 100644 index 00000000000..df6bab21dae --- /dev/null +++ b/samples/client/petstore/swift4/objcCompatible/docs/AnimalFarm.md @@ -0,0 +1,9 @@ +# AnimalFarm + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/samples/client/petstore/swift4/objcCompatible/docs/FakeAPI.md b/samples/client/petstore/swift4/objcCompatible/docs/FakeAPI.md index befabdf3505..f90c5bbc98d 100644 --- a/samples/client/petstore/swift4/objcCompatible/docs/FakeAPI.md +++ b/samples/client/petstore/swift4/objcCompatible/docs/FakeAPI.md @@ -4,7 +4,6 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- -[**createXmlItem**](FakeAPI.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem [**fakeOuterBooleanSerialize**](FakeAPI.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | [**fakeOuterCompositeSerialize**](FakeAPI.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | [**fakeOuterNumberSerialize**](FakeAPI.md#fakeouternumberserialize) | **POST** /fake/outer/number | @@ -17,59 +16,8 @@ Method | HTTP request | Description [**testGroupParameters**](FakeAPI.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional) [**testInlineAdditionalProperties**](FakeAPI.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties [**testJsonFormData**](FakeAPI.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data -[**testQueryParameterCollectionFormat**](FakeAPI.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-paramters | -# **createXmlItem** -```swift - open class func createXmlItem(xmlItem: XmlItem, completion: @escaping (_ data: Void?, _ error: Error?) -> Void) -``` - -creates an XmlItem - -this route creates an XmlItem - -### Example -```swift -// The following code samples are still beta. For any issue, please report via http://github.com/OpenAPITools/openapi-generator/issues/new -import PetstoreClient - -let xmlItem = XmlItem(attributeString: "attributeString_example", attributeNumber: 123, attributeInteger: 123, attributeBoolean: false, wrappedArray: [123], nameString: "nameString_example", nameNumber: 123, nameInteger: 123, nameBoolean: false, nameArray: [123], nameWrappedArray: [123], prefixString: "prefixString_example", prefixNumber: 123, prefixInteger: 123, prefixBoolean: false, prefixArray: [123], prefixWrappedArray: [123], namespaceString: "namespaceString_example", namespaceNumber: 123, namespaceInteger: 123, namespaceBoolean: false, namespaceArray: [123], namespaceWrappedArray: [123], prefixNsString: "prefixNsString_example", prefixNsNumber: 123, prefixNsInteger: 123, prefixNsBoolean: false, prefixNsArray: [123], prefixNsWrappedArray: [123]) // XmlItem | XmlItem Body - -// creates an XmlItem -FakeAPI.createXmlItem(xmlItem: xmlItem) { (response, error) in - guard error == nil else { - print(error) - return - } - - if (response) { - dump(response) - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **xmlItem** | [**XmlItem**](XmlItem.md) | XmlItem Body | - -### Return type - -Void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16 - - **Accept**: Not defined - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **fakeOuterBooleanSerialize** ```swift open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping (_ data: Bool?, _ error: Error?) -> Void) @@ -712,60 +660,3 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **testQueryParameterCollectionFormat** -```swift - open class func testQueryParameterCollectionFormat(pipe: [String], ioutil: [String], http: [String], url: [String], context: [String], completion: @escaping (_ data: Void?, _ error: Error?) -> Void) -``` - - - -To test the collection format in query parameters - -### Example -```swift -// The following code samples are still beta. For any issue, please report via http://github.com/OpenAPITools/openapi-generator/issues/new -import PetstoreClient - -let pipe = ["inner_example"] // [String] | -let ioutil = ["inner_example"] // [String] | -let http = ["inner_example"] // [String] | -let url = ["inner_example"] // [String] | -let context = ["inner_example"] // [String] | - -FakeAPI.testQueryParameterCollectionFormat(pipe: pipe, ioutil: ioutil, http: http, url: url, context: context) { (response, error) in - guard error == nil else { - print(error) - return - } - - if (response) { - dump(response) - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **pipe** | [**[String]**](String.md) | | - **ioutil** | [**[String]**](String.md) | | - **http** | [**[String]**](String.md) | | - **url** | [**[String]**](String.md) | | - **context** | [**[String]**](String.md) | | - -### Return type - -Void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - diff --git a/samples/client/petstore/swift4/objcCompatible/docs/FormatTest.md b/samples/client/petstore/swift4/objcCompatible/docs/FormatTest.md index 55de2e05ecd..f74d94f6c46 100644 --- a/samples/client/petstore/swift4/objcCompatible/docs/FormatTest.md +++ b/samples/client/petstore/swift4/objcCompatible/docs/FormatTest.md @@ -16,7 +16,6 @@ Name | Type | Description | Notes **dateTime** | **Date** | | [optional] **uuid** | **UUID** | | [optional] **password** | **String** | | -**bigDecimal** | **Decimal** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/swift4/objcCompatible/docs/MapTest.md b/samples/client/petstore/swift4/objcCompatible/docs/MapTest.md index 664861c03fd..56213c4113f 100644 --- a/samples/client/petstore/swift4/objcCompatible/docs/MapTest.md +++ b/samples/client/petstore/swift4/objcCompatible/docs/MapTest.md @@ -6,7 +6,7 @@ Name | Type | Description | Notes **mapMapOfString** | [String:[String:String]] | | [optional] **mapOfEnumString** | **[String:String]** | | [optional] **directMap** | **[String:Bool]** | | [optional] -**indirectMap** | **[String:Bool]** | | [optional] +**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/swift4/objcCompatible/docs/StringBooleanMap.md b/samples/client/petstore/swift4/objcCompatible/docs/StringBooleanMap.md new file mode 100644 index 00000000000..7abf11ec68b --- /dev/null +++ b/samples/client/petstore/swift4/objcCompatible/docs/StringBooleanMap.md @@ -0,0 +1,9 @@ +# StringBooleanMap + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/samples/client/petstore/swift4/objcCompatible/docs/TypeHolderExample.md b/samples/client/petstore/swift4/objcCompatible/docs/TypeHolderExample.md index c0530dc0e5b..46d0471cd71 100644 --- a/samples/client/petstore/swift4/objcCompatible/docs/TypeHolderExample.md +++ b/samples/client/petstore/swift4/objcCompatible/docs/TypeHolderExample.md @@ -5,7 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **stringItem** | **String** | | **numberItem** | **Double** | | -**floatItem** | **Float** | | **integerItem** | **Int** | | **boolItem** | **Bool** | | **arrayItem** | **[Int]** | | diff --git a/samples/client/petstore/swift4/promisekitLibrary/Package.swift b/samples/client/petstore/swift4/promisekitLibrary/Package.swift index 7ba5c67b456..fbf22f5f823 100644 --- a/samples/client/petstore/swift4/promisekitLibrary/Package.swift +++ b/samples/client/petstore/swift4/promisekitLibrary/Package.swift @@ -9,12 +9,12 @@ let package = Package( // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"]), ], dependencies: [ // Dependencies declare other packages that this package depends on. .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.0"), - .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.11.0") + .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.11.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -23,6 +23,6 @@ let package = Package( name: "PetstoreClient", dependencies: ["Alamofire", "PromiseKit"], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift4/swift4_test_all.sh b/samples/client/petstore/swift4/swift4_test_all.sh index 0b5f7a1a778..74a514d39df 100644 --- a/samples/client/petstore/swift4/swift4_test_all.sh +++ b/samples/client/petstore/swift4/swift4_test_all.sh @@ -2,14 +2,16 @@ set -e +DIRECTORY=`dirname $0` + # example project with unit tests -mvn -f default/SwaggerClientTests/pom.xml integration-test -mvn -f promisekitLibrary/SwaggerClientTests/pom.xml integration-test -mvn -f rxswiftLibrary/SwaggerClientTests/pom.xml integration-test +mvn -f $DIRECTORY/default/SwaggerClientTests/pom.xml integration-test +mvn -f $DIRECTORY/promisekitLibrary/SwaggerClientTests/pom.xml integration-test +mvn -f $DIRECTORY/rxswiftLibrary/SwaggerClientTests/pom.xml integration-test # spm build -mvn -f default/pom.xml integration-test -# mvn -f objcCompatible/pom.xml integration-test -mvn -f promisekitLibrary/pom.xml integration-test -mvn -f rxswiftLibrary/pom.xml integration-test -mvn -f unwrapRequired/pom.xml integration-test +mvn -f $DIRECTORY/default/pom.xml integration-test +mvn -f $DIRECTORY/objcCompatible/pom.xml integration-test +mvn -f $DIRECTORY/promisekitLibrary/pom.xml integration-test +mvn -f $DIRECTORY/rxswiftLibrary/pom.xml integration-test +mvn -f $DIRECTORY/unwrapRequired/pom.xml integration-test diff --git a/samples/client/test/swift4/swift4_test_all.sh b/samples/client/test/swift4/swift4_test_all.sh index c6ff65b4b58..dcb30d887c9 100644 --- a/samples/client/test/swift4/swift4_test_all.sh +++ b/samples/client/test/swift4/swift4_test_all.sh @@ -2,8 +2,10 @@ set -e +DIRECTORY=`dirname $0` + # example project with unit tests -mvn -f default/TestClientApp/pom.xml integration-test +mvn -f $DIRECTORY/default/TestClientApp/pom.xml integration-test # spm build -mvn -f default/pom.xml integration-test +mvn -f $DIRECTORY/default/pom.xml integration-test