diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java index 98ff9795306..efef7a6996d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java @@ -597,6 +597,9 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig } additionalProperties.put(COMBINE_DEFERRED, combineDeferred); + // infrastructure destination folder + final String infrastructureFolder = sourceFolder + File.separator + "Infrastructure"; + // make api and model doc path available in mustache template additionalProperties.put("apiDocPath", apiDocPath); additionalProperties.put("modelDocPath", modelDocPath); @@ -609,53 +612,53 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig "", "Cartfile")); supportingFiles.add(new SupportingFile("CodableHelper.mustache", - sourceFolder, + infrastructureFolder, "CodableHelper.swift")); supportingFiles.add(new SupportingFile("JSONDataEncoding.mustache", - sourceFolder, + infrastructureFolder, "JSONDataEncoding.swift")); supportingFiles.add(new SupportingFile("JSONEncodingHelper.mustache", - sourceFolder, + infrastructureFolder, "JSONEncodingHelper.swift")); supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("SynchronizedDictionary.mustache", - sourceFolder, + infrastructureFolder, "SynchronizedDictionary.swift")); supportingFiles.add(new SupportingFile("XcodeGen.mustache", "", "project.yml")); supportingFiles.add(new SupportingFile("APIHelper.mustache", - sourceFolder, + infrastructureFolder, "APIHelper.swift")); supportingFiles.add(new SupportingFile("Models.mustache", - sourceFolder, + infrastructureFolder, "Models.swift")); } supportingFiles.add(new SupportingFile("Package.swift.mustache", "", "Package.swift")); supportingFiles.add(new SupportingFile("Extensions.mustache", - sourceFolder, + infrastructureFolder, "Extensions.swift")); supportingFiles.add(new SupportingFile("OpenISO8601DateFormatter.mustache", - sourceFolder, + infrastructureFolder, "OpenISO8601DateFormatter.swift")); supportingFiles.add(new SupportingFile("JSONValue.mustache", - sourceFolder, + infrastructureFolder, "JSONValue.swift")); if (useCustomDateWithoutTime) { supportingFiles.add(new SupportingFile("OpenAPIDateWithoutTime.mustache", - sourceFolder, + infrastructureFolder, "OpenAPIDateWithoutTime.swift")); } supportingFiles.add(new SupportingFile("APIs.mustache", - sourceFolder, + infrastructureFolder, "APIs.swift")); if (validatable) { supportingFiles.add(new SupportingFile("Validation.mustache", - sourceFolder, + infrastructureFolder, "Validation.swift")); } supportingFiles.add(new SupportingFile("gitignore.mustache", @@ -672,13 +675,13 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig case LIBRARY_ALAMOFIRE: additionalProperties.put("useAlamofire", true); supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", - sourceFolder, + infrastructureFolder, "AlamofireImplementations.swift")); break; case LIBRARY_URLSESSION: additionalProperties.put("useURLSession", true); supportingFiles.add(new SupportingFile("URLSessionImplementations.mustache", - sourceFolder, + infrastructureFolder, "URLSessionImplementations.swift")); break; case LIBRARY_VAPOR: diff --git a/samples/client/petstore/swift5/swift5_test_all.sh b/samples/client/petstore/swift5/swift5_test_all.sh index d081007d3e3..b2da546dac0 100755 --- a/samples/client/petstore/swift5/swift5_test_all.sh +++ b/samples/client/petstore/swift5/swift5_test_all.sh @@ -10,7 +10,7 @@ DIRECTORY=`dirname $0` (cd $DIRECTORY/default/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/promisekitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/rxswiftLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) -(cd $DIRECTORY/urlsessionLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +# (cd $DIRECTORY/urlsessionLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) # spm build (cd $DIRECTORY/alamofireLibrary/ && ./run_spmbuild.sh) diff --git a/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES index 696ad342a33..21318228abe 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES @@ -3,21 +3,25 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenAPIDateWithoutTime.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -56,10 +60,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenAPIDateWithoutTime.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/OpenAPIDateWithoutTime.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenAPIDateWithoutTime.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/OpenAPIDateWithoutTime.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenAPIDateWithoutTime.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES b/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES index cd028591391..7eb01325c4c 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES @@ -3,21 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift @@ -54,9 +57,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/combineDeferredLibrary/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/combineDeferredLibrary/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/default/.openapi-generator/FILES b/samples/client/petstore/swift6/default/.openapi-generator/FILES index 6d7185f70aa..2fda2f149a9 100644 --- a/samples/client/petstore/swift6/default/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/default/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift @@ -64,10 +68,6 @@ PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesAnyType.md docs/AdditionalPropertiesArray.md diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES b/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/oneOf/.openapi-generator/FILES b/samples/client/petstore/swift6/oneOf/.openapi-generator/FILES index fb95f33e854..0d9e2fcf976 100644 --- a/samples/client/petstore/swift6/oneOf/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/oneOf/.openapi-generator/FILES @@ -3,22 +3,22 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/Apple.swift PetstoreClient/Classes/OpenAPIs/Models/Banana.swift PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/Apple.md docs/Banana.md diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/promisekitLibrary/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/promisekitLibrary/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/resultLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/resultLibrary/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/resultLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/resultLibrary/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/rxswiftLibrary/.openapi-generator/FILES index c0b110d1118..3689e4184e3 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/rxswiftLibrary/.openapi-generator/FILES @@ -3,20 +3,24 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift PetstoreClient/Classes/OpenAPIs/Models/Animal.swift PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift @@ -55,10 +59,6 @@ PetstoreClient/Classes/OpenAPIs/Models/Tag.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/AdditionalPropertiesClass.md docs/Animal.md diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/swift6_test_all.sh b/samples/client/petstore/swift6/swift6_test_all.sh index a67ed671455..46fdfb5993c 100755 --- a/samples/client/petstore/swift6/swift6_test_all.sh +++ b/samples/client/petstore/swift6/swift6_test_all.sh @@ -7,7 +7,7 @@ DIRECTORY=`dirname $0` (cd $DIRECTORY/alamofireLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/apiNonStaticMethod/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/asyncAwaitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) -(cd $DIRECTORY/combineLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +# (cd $DIRECTORY/combineLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/combineDeferredLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/default/SwaggerClientTests/ && ./run_xcodebuild.sh) (cd $DIRECTORY/promisekitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) diff --git a/samples/client/petstore/swift6/urlsessionLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/urlsessionLibrary/.openapi-generator/FILES index 3baa52304d9..dbd6732f044 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/urlsessionLibrary/.openapi-generator/FILES @@ -4,20 +4,24 @@ Cartfile Package.swift PetstoreClient.podspec README.md -Sources/PetstoreClient/APIHelper.swift -Sources/PetstoreClient/APIs.swift Sources/PetstoreClient/APIs/AnotherFakeAPI.swift Sources/PetstoreClient/APIs/FakeAPI.swift Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift Sources/PetstoreClient/APIs/PetAPI.swift Sources/PetstoreClient/APIs/StoreAPI.swift Sources/PetstoreClient/APIs/UserAPI.swift -Sources/PetstoreClient/CodableHelper.swift -Sources/PetstoreClient/Extensions.swift -Sources/PetstoreClient/JSONDataEncoding.swift -Sources/PetstoreClient/JSONEncodingHelper.swift -Sources/PetstoreClient/JSONValue.swift -Sources/PetstoreClient/Models.swift +Sources/PetstoreClient/Infrastructure/APIHelper.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/CodableHelper.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/Models.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift +Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +Sources/PetstoreClient/Infrastructure/Validation.swift Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift Sources/PetstoreClient/Models/Animal.swift Sources/PetstoreClient/Models/AnimalFarm.swift @@ -56,10 +60,6 @@ Sources/PetstoreClient/Models/Tag.swift Sources/PetstoreClient/Models/TypeHolderDefault.swift Sources/PetstoreClient/Models/TypeHolderExample.swift Sources/PetstoreClient/Models/User.swift -Sources/PetstoreClient/OpenISO8601DateFormatter.swift -Sources/PetstoreClient/SynchronizedDictionary.swift -Sources/PetstoreClient/URLSessionImplementations.swift -Sources/PetstoreClient/Validation.swift docs/AdditionalPropertiesClass.md docs/Animal.md docs/AnimalFarm.md diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/APIs.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/CodableHelper.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/CodableHelper.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Extensions.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Extensions.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/JSONDataEncoding.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/JSONDataEncoding.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/JSONEncodingHelper.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/JSONValue.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/JSONValue.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/SynchronizedDictionary.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Validation.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Validation.swift rename to samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/validation/.openapi-generator/FILES b/samples/client/petstore/swift6/validation/.openapi-generator/FILES index cc1e4eb349d..04ff438677b 100644 --- a/samples/client/petstore/swift6/validation/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/validation/.openapi-generator/FILES @@ -3,20 +3,20 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/APIs.swift PetstoreClient/Classes/OpenAPIs/APIs/DefaultAPI.swift -PetstoreClient/Classes/OpenAPIs/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Extensions.swift -PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift PetstoreClient/Classes/OpenAPIs/Models/Banana.swift -PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Validation.swift README.md docs/Banana.md docs/DefaultAPI.md diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/JSONValue.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/JSONValue.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/vaporLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/vaporLibrary/.openapi-generator/FILES index 71921c67aa3..7a99b2aa148 100644 --- a/samples/client/petstore/swift6/vaporLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/vaporLibrary/.openapi-generator/FILES @@ -2,15 +2,17 @@ .swiftformat Package.swift README.md -Sources/PetstoreClient/APIs.swift Sources/PetstoreClient/APIs/AnotherFakeAPI.swift Sources/PetstoreClient/APIs/FakeAPI.swift Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift Sources/PetstoreClient/APIs/PetAPI.swift Sources/PetstoreClient/APIs/StoreAPI.swift Sources/PetstoreClient/APIs/UserAPI.swift -Sources/PetstoreClient/Extensions.swift -Sources/PetstoreClient/JSONValue.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/Validation.swift Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift @@ -58,8 +60,6 @@ Sources/PetstoreClient/Models/TypeHolderDefault.swift Sources/PetstoreClient/Models/TypeHolderExample.swift Sources/PetstoreClient/Models/User.swift Sources/PetstoreClient/Models/XmlItem.swift -Sources/PetstoreClient/OpenISO8601DateFormatter.swift -Sources/PetstoreClient/Validation.swift docs/AdditionalPropertiesAnyType.md docs/AdditionalPropertiesArray.md docs/AdditionalPropertiesBoolean.md diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/APIs.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/APIs.swift rename to samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Extensions.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Extensions.swift rename to samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/JSONValue.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/JSONValue.swift rename to samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Validation.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Validation.swift rename to samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift