Skip to content

Commit

Permalink
[swift6] move infrastructure file inside infrastructure folder (#19765)
Browse files Browse the repository at this point in the history 
* [swift6] replace AnyCodable with JSONValue

* [swift6] create infrastructure folder

* [swift6] replace AnyCodable with JSONValue

* [swift6] create infrastructure folder

* [swift6] replace AnyCodable with JSONValue

* Try to fix CI
  • Loading branch information
@4brunu
4brunu authored Oct 3, 2024
1 parent 2437d7f commit c9a9ae0
Show file tree
Hide file tree
Showing 179 changed files with 181 additions and 178 deletions.
31 changes: 17 additions & 14 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,9 @@ public void processOpts() {
}
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);
Expand All @@ -609,53 +612,53 @@ public void processOpts() {
"",
"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",
Expand All @@ -672,13 +675,13 @@ public void processOpts() {
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:
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/swift5/swift5_test_all.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 ...reClient/Classes/OpenAPIs/APIHelper.swift → ...s/OpenAPIs/Infrastructure/APIHelper.swift
View file
File renamed without changes.
0 ...etstoreClient/Classes/OpenAPIs/APIs.swift → ...lasses/OpenAPIs/Infrastructure/APIs.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/AlamofireImplementations.swift → ...astructure/AlamofireImplementations.swift
View file
File renamed without changes.
0 ...ient/Classes/OpenAPIs/CodableHelper.swift → ...enAPIs/Infrastructure/CodableHelper.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Extensions.swift → .../OpenAPIs/Infrastructure/Extensions.swift
View file
File renamed without changes.
0 ...t/Classes/OpenAPIs/JSONDataEncoding.swift → ...PIs/Infrastructure/JSONDataEncoding.swift
View file
File renamed without changes.
0 ...Classes/OpenAPIs/JSONEncodingHelper.swift → ...s/Infrastructure/JSONEncodingHelper.swift
View file
File renamed without changes.
0 ...reClient/Classes/OpenAPIs/JSONValue.swift → ...s/OpenAPIs/Infrastructure/JSONValue.swift
View file
File renamed without changes.
0 ...storeClient/Classes/OpenAPIs/Models.swift → ...sses/OpenAPIs/Infrastructure/Models.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/OpenAPIDateWithoutTime.swift → ...frastructure/OpenAPIDateWithoutTime.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/OpenISO8601DateFormatter.swift → ...astructure/OpenISO8601DateFormatter.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/SynchronizedDictionary.swift → ...frastructure/SynchronizedDictionary.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Validation.swift → .../OpenAPIs/Infrastructure/Validation.swift
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 ...reClient/Classes/OpenAPIs/APIHelper.swift → ...s/OpenAPIs/Infrastructure/APIHelper.swift
View file
File renamed without changes.
0 ...etstoreClient/Classes/OpenAPIs/APIs.swift → ...lasses/OpenAPIs/Infrastructure/APIs.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/AlamofireImplementations.swift → ...astructure/AlamofireImplementations.swift
View file
File renamed without changes.
0 ...ient/Classes/OpenAPIs/CodableHelper.swift → ...enAPIs/Infrastructure/CodableHelper.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Extensions.swift → .../OpenAPIs/Infrastructure/Extensions.swift
View file
File renamed without changes.
0 ...t/Classes/OpenAPIs/JSONDataEncoding.swift → ...PIs/Infrastructure/JSONDataEncoding.swift
View file
File renamed without changes.
0 ...Classes/OpenAPIs/JSONEncodingHelper.swift → ...s/Infrastructure/JSONEncodingHelper.swift
View file
File renamed without changes.
0 ...reClient/Classes/OpenAPIs/JSONValue.swift → ...s/OpenAPIs/Infrastructure/JSONValue.swift
View file
File renamed without changes.
0 ...storeClient/Classes/OpenAPIs/Models.swift → ...sses/OpenAPIs/Infrastructure/Models.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/OpenISO8601DateFormatter.swift → ...astructure/OpenISO8601DateFormatter.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/SynchronizedDictionary.swift → ...frastructure/SynchronizedDictionary.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Validation.swift → .../OpenAPIs/Infrastructure/Validation.swift
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 ...reClient/Classes/OpenAPIs/APIHelper.swift → ...s/OpenAPIs/Infrastructure/APIHelper.swift
View file
File renamed without changes.
0 ...etstoreClient/Classes/OpenAPIs/APIs.swift → ...lasses/OpenAPIs/Infrastructure/APIs.swift
View file
File renamed without changes.
0 ...ient/Classes/OpenAPIs/CodableHelper.swift → ...enAPIs/Infrastructure/CodableHelper.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Extensions.swift → .../OpenAPIs/Infrastructure/Extensions.swift
View file
File renamed without changes.
0 ...t/Classes/OpenAPIs/JSONDataEncoding.swift → ...PIs/Infrastructure/JSONDataEncoding.swift
View file
File renamed without changes.
0 ...Classes/OpenAPIs/JSONEncodingHelper.swift → ...s/Infrastructure/JSONEncodingHelper.swift
View file
File renamed without changes.
0 ...reClient/Classes/OpenAPIs/JSONValue.swift → ...s/OpenAPIs/Infrastructure/JSONValue.swift
View file
File renamed without changes.
0 ...storeClient/Classes/OpenAPIs/Models.swift → ...sses/OpenAPIs/Infrastructure/Models.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/OpenISO8601DateFormatter.swift → ...astructure/OpenISO8601DateFormatter.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/SynchronizedDictionary.swift → ...frastructure/SynchronizedDictionary.swift
View file
File renamed without changes.
0 .../OpenAPIs/URLSessionImplementations.swift → ...structure/URLSessionImplementations.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Validation.swift → .../OpenAPIs/Infrastructure/Validation.swift
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions samples/client/petstore/swift6/combineDeferredLibrary/.openapi-generator/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 ...reClient/Classes/OpenAPIs/APIHelper.swift → ...s/OpenAPIs/Infrastructure/APIHelper.swift
View file
File renamed without changes.
0 ...etstoreClient/Classes/OpenAPIs/APIs.swift → ...lasses/OpenAPIs/Infrastructure/APIs.swift
View file
File renamed without changes.
0 ...ient/Classes/OpenAPIs/CodableHelper.swift → ...enAPIs/Infrastructure/CodableHelper.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Extensions.swift → .../OpenAPIs/Infrastructure/Extensions.swift
View file
File renamed without changes.
0 ...t/Classes/OpenAPIs/JSONDataEncoding.swift → ...PIs/Infrastructure/JSONDataEncoding.swift
View file
File renamed without changes.
0 ...Classes/OpenAPIs/JSONEncodingHelper.swift → ...s/Infrastructure/JSONEncodingHelper.swift
View file
File renamed without changes.
0 ...reClient/Classes/OpenAPIs/JSONValue.swift → ...s/OpenAPIs/Infrastructure/JSONValue.swift
View file
File renamed without changes.
0 ...storeClient/Classes/OpenAPIs/Models.swift → ...sses/OpenAPIs/Infrastructure/Models.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/OpenISO8601DateFormatter.swift → ...astructure/OpenISO8601DateFormatter.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/SynchronizedDictionary.swift → ...frastructure/SynchronizedDictionary.swift
View file
File renamed without changes.
0 .../OpenAPIs/URLSessionImplementations.swift → ...structure/URLSessionImplementations.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Validation.swift → .../OpenAPIs/Infrastructure/Validation.swift
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 ...reClient/Classes/OpenAPIs/APIHelper.swift → ...s/OpenAPIs/Infrastructure/APIHelper.swift
View file
File renamed without changes.
0 ...etstoreClient/Classes/OpenAPIs/APIs.swift → ...lasses/OpenAPIs/Infrastructure/APIs.swift
View file
File renamed without changes.
0 ...ient/Classes/OpenAPIs/CodableHelper.swift → ...enAPIs/Infrastructure/CodableHelper.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Extensions.swift → .../OpenAPIs/Infrastructure/Extensions.swift
View file
File renamed without changes.
0 ...t/Classes/OpenAPIs/JSONDataEncoding.swift → ...PIs/Infrastructure/JSONDataEncoding.swift
View file
File renamed without changes.
0 ...Classes/OpenAPIs/JSONEncodingHelper.swift → ...s/Infrastructure/JSONEncodingHelper.swift
View file
File renamed without changes.
0 ...reClient/Classes/OpenAPIs/JSONValue.swift → ...s/OpenAPIs/Infrastructure/JSONValue.swift
View file
File renamed without changes.
0 ...storeClient/Classes/OpenAPIs/Models.swift → ...sses/OpenAPIs/Infrastructure/Models.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/OpenISO8601DateFormatter.swift → ...astructure/OpenISO8601DateFormatter.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/SynchronizedDictionary.swift → ...frastructure/SynchronizedDictionary.swift
View file
File renamed without changes.
0 .../OpenAPIs/URLSessionImplementations.swift → ...structure/URLSessionImplementations.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Validation.swift → .../OpenAPIs/Infrastructure/Validation.swift
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions samples/client/petstore/swift6/default/.openapi-generator/FILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 ...reClient/Classes/OpenAPIs/APIHelper.swift → ...s/OpenAPIs/Infrastructure/APIHelper.swift
View file
File renamed without changes.
0 ...etstoreClient/Classes/OpenAPIs/APIs.swift → ...lasses/OpenAPIs/Infrastructure/APIs.swift
View file
File renamed without changes.
0 ...ient/Classes/OpenAPIs/CodableHelper.swift → ...enAPIs/Infrastructure/CodableHelper.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Extensions.swift → .../OpenAPIs/Infrastructure/Extensions.swift
View file
File renamed without changes.
0 ...t/Classes/OpenAPIs/JSONDataEncoding.swift → ...PIs/Infrastructure/JSONDataEncoding.swift
View file
File renamed without changes.
0 ...Classes/OpenAPIs/JSONEncodingHelper.swift → ...s/Infrastructure/JSONEncodingHelper.swift
View file
File renamed without changes.
0 ...reClient/Classes/OpenAPIs/JSONValue.swift → ...s/OpenAPIs/Infrastructure/JSONValue.swift
View file
File renamed without changes.
0 ...storeClient/Classes/OpenAPIs/Models.swift → ...sses/OpenAPIs/Infrastructure/Models.swift
View file
File renamed without changes.
0 ...s/OpenAPIs/OpenISO8601DateFormatter.swift → ...astructure/OpenISO8601DateFormatter.swift
View file
File renamed without changes.
0 ...ses/OpenAPIs/SynchronizedDictionary.swift → ...frastructure/SynchronizedDictionary.swift
View file
File renamed without changes.
0 .../OpenAPIs/URLSessionImplementations.swift → ...structure/URLSessionImplementations.swift
View file
File renamed without changes.
0 ...eClient/Classes/OpenAPIs/Validation.swift → .../OpenAPIs/Infrastructure/Validation.swift
View file
File renamed without changes.
Loading

0 comments on commit c9a9ae0

Please sign in to comment.