[swift6] useSPMFileStructure by default (#19772)

* [swift6] useSPMFileStructure by default

* [swift6] useSPMFileStructure by default

* [swift6] useSPMFileStructure by default

bin/configs/swift6-combineDeferredLibrary.yaml

@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
   responseAs: Combine
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

bin/configs/swift6-combineLibrary.yaml

@@ -6,6 +6,7 @@ generateAliasAsModel: true
 additionalProperties:
   responseAs: Combine
   combineDeferred: false
+  swiftPackagePath: "Sources/CombineLibrary"
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

bin/configs/swift6-oneOf.yaml

@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

bin/configs/swift6-promisekitLibrary.yaml

@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  useSPMFileStructure: false
   responseAs: PromiseKit
   podAuthors: ""
   podSummary: PetstoreClient

bin/configs/swift6-resultLibrary.yaml

@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
   responseAs: Result
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   sortParamsByRequiredFlag: false

bin/configs/swift6-rxswiftLibrary.yaml

@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
   responseAs: RxSwift
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

bin/configs/swift6-validation.yaml

@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/validation.yaml
 templateDir: modules/openapi-generator/src/main/resources/swift6
 generateAliasAsModel: true
 additionalProperties:
+  useSPMFileStructure: false
   podAuthors: ""
   podSummary: PetstoreClient
   projectName: PetstoreClient

docs/generators/swift6.md

@@ -50,13 +50,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |responseAs|Optionally use libraries to manage response.  Currently PromiseKit, RxSwift, Result, Combine, AsyncAwait are available.| |null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|swiftPackagePath|Set a custom source path instead of OpenAPIClient/Classes/OpenAPIs.| |null|
+|swiftPackagePath|Set a custom source path instead of Sources/{{projectName}}.| |null|
 |swiftUseApiNamespace|Flag to make all the API classes inner-class of {{projectName}}API| |null|
 |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false|
 |useClasses|Use final classes for models instead of structs (default: false)| |false|
 |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false|
 |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true|
-|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: false).| |null|
+|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: true).| |null|
 |validatable|Make validation rules and validator for model properies (default: true)| |true|
 
 ## IMPORT MAPPING

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

@@ -98,9 +98,9 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
     @Setter
     protected boolean swiftUseApiNamespace = false;
     @Setter
-    protected boolean useSPMFileStructure = false;
+    protected boolean useSPMFileStructure = true;
     @Setter
-    protected String swiftPackagePath = "Classes" + File.separator + "OpenAPIs";
+    protected String swiftPackagePath = "Sources" + File.separator + projectName;
     @Setter
     protected boolean oneOfUnknownDefaultCase = false;
     @Setter
@@ -323,9 +323,9 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
 
         cliOptions.add(new CliOption(CodegenConstants.API_NAME_PREFIX, CodegenConstants.API_NAME_PREFIX_DESC));
         cliOptions.add(new CliOption(USE_SPM_FILE_STRUCTURE, "Use SPM file structure"
-                + " and set the source path to Sources" + File.separator + "{{projectName}} (default: false)."));
+                + " and set the source path to Sources" + File.separator + "{{projectName}} (default: true)."));
         cliOptions.add(new CliOption(SWIFT_PACKAGE_PATH, "Set a custom source path instead of "
-                + projectName + File.separator + "Classes" + File.separator + "OpenAPIs" + "."));
+                + "Sources" + File.separator + "{{projectName}}" + "."));
         cliOptions.add(new CliOption(USE_CLASSES, "Use final classes for models instead of structs (default: false)")
                 .defaultValue(Boolean.FALSE.toString()));
 
@@ -458,7 +458,6 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
         } else {
             additionalProperties.put(PROJECT_NAME, projectName);
         }
-        sourceFolder = projectName + File.separator + sourceFolder;
 
         // Setup nonPublicApi option, which generates code with reduced access
         // modifiers; allows embedding elsewhere without exposing non-public API calls
@@ -517,6 +516,7 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
         if (additionalProperties.containsKey(SWIFT_USE_API_NAMESPACE)) {
             setSwiftUseApiNamespace(convertPropertyToBooleanAndWriteBack(SWIFT_USE_API_NAMESPACE));
         }
+        additionalProperties.put(SWIFT_USE_API_NAMESPACE, swiftUseApiNamespace);
 
         if (!additionalProperties.containsKey(POD_AUTHORS)) {
             additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS);
@@ -524,7 +524,12 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
 
         if (additionalProperties.containsKey(USE_SPM_FILE_STRUCTURE)) {
             setUseSPMFileStructure(convertPropertyToBooleanAndWriteBack(USE_SPM_FILE_STRUCTURE));
+        }
+        additionalProperties.put(USE_SPM_FILE_STRUCTURE, useSPMFileStructure);
+        if (useSPMFileStructure) {
             sourceFolder = "Sources" + File.separator + projectName;
+        } else {
+            sourceFolder = projectName + File.separator + "Classes" + File.separator + "OpenAPIs";
         }
 
         if (additionalProperties.containsKey(SWIFT_PACKAGE_PATH)

samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES

@@ -3,64 +3,64 @@
 Cartfile
 Package.swift
 PetstoreClient.podspec
-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/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
-PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
-PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
-PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
-PetstoreClient/Classes/OpenAPIs/Models/Category.swift
-PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
-PetstoreClient/Classes/OpenAPIs/Models/Client.swift
-PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
-PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
-PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
-PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/File.swift
-PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
-PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/List.swift
-PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
-PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
-PetstoreClient/Classes/OpenAPIs/Models/Name.swift
-PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/Order.swift
-PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
-PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
-PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
-PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
-PetstoreClient/Classes/OpenAPIs/Models/Return.swift
-PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
-PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
-PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
-PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
-PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
-PetstoreClient/Classes/OpenAPIs/Models/User.swift
 README.md
+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/Infrastructure/APIHelper.swift
+Sources/PetstoreClient/Infrastructure/APIs.swift
+Sources/PetstoreClient/Infrastructure/AlamofireImplementations.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/OpenAPIDateWithoutTime.swift
+Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift
+Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift
+Sources/PetstoreClient/Infrastructure/Validation.swift
+Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift
+Sources/PetstoreClient/Models/Animal.swift
+Sources/PetstoreClient/Models/AnimalFarm.swift
+Sources/PetstoreClient/Models/ApiResponse.swift
+Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift
+Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift
+Sources/PetstoreClient/Models/ArrayTest.swift
+Sources/PetstoreClient/Models/Capitalization.swift
+Sources/PetstoreClient/Models/Cat.swift
+Sources/PetstoreClient/Models/Category.swift
+Sources/PetstoreClient/Models/ClassModel.swift
+Sources/PetstoreClient/Models/Client.swift
+Sources/PetstoreClient/Models/Dog.swift
+Sources/PetstoreClient/Models/EnumArrays.swift
+Sources/PetstoreClient/Models/EnumClass.swift
+Sources/PetstoreClient/Models/EnumTest.swift
+Sources/PetstoreClient/Models/File.swift
+Sources/PetstoreClient/Models/FileSchemaTestClass.swift
+Sources/PetstoreClient/Models/FormatTest.swift
+Sources/PetstoreClient/Models/HasOnlyReadOnly.swift
+Sources/PetstoreClient/Models/List.swift
+Sources/PetstoreClient/Models/MapTest.swift
+Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+Sources/PetstoreClient/Models/Model200Response.swift
+Sources/PetstoreClient/Models/Name.swift
+Sources/PetstoreClient/Models/NumberOnly.swift
+Sources/PetstoreClient/Models/Order.swift
+Sources/PetstoreClient/Models/OuterComposite.swift
+Sources/PetstoreClient/Models/OuterEnum.swift
+Sources/PetstoreClient/Models/Pet.swift
+Sources/PetstoreClient/Models/ReadOnlyFirst.swift
+Sources/PetstoreClient/Models/Return.swift
+Sources/PetstoreClient/Models/SpecialModelName.swift
+Sources/PetstoreClient/Models/StringBooleanMap.swift
+Sources/PetstoreClient/Models/Tag.swift
+Sources/PetstoreClient/Models/TypeHolderDefault.swift
+Sources/PetstoreClient/Models/TypeHolderExample.swift
+Sources/PetstoreClient/Models/User.swift
 docs/AdditionalPropertiesClass.md
 docs/Animal.md
 docs/AnimalFarm.md

samples/client/petstore/swift6/alamofireLibrary/Package.swift

@@ -27,7 +27,7 @@ let package = Package(
         .target(
             name: "PetstoreClient",
             dependencies: ["Alamofire", ],
-            path: "PetstoreClient/Classes"
+            path: "Sources/PetstoreClient"
         ),
     ],
     swiftLanguageModes: [.v6]

samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec

@@ -10,6 +10,6 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/openapitools/openapi-generator'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/**/*.swift'
+  s.source_files = 'Sources/PetstoreClient/**/*.swift'
   s.dependency 'Alamofire', '~> 5.9'
 end

samples/client/petstore/swift6/alamofireLibrary/project.yml

@@ -4,7 +4,7 @@ targets:
     type: framework
     platform: iOS
     deploymentTarget: "11.0"
-    sources: [PetstoreClient]
+    sources: [Sources]
     info:
       path: ./Info.plist
       version: 1.0.0

samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES

@@ -3,61 +3,61 @@
 Cartfile
 Package.swift
 PetstoreClient.podspec
-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/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
-PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
-PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
-PetstoreClient/Classes/OpenAPIs/Models/Category.swift
-PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
-PetstoreClient/Classes/OpenAPIs/Models/Client.swift
-PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
-PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
-PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
-PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/File.swift
-PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
-PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/List.swift
-PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
-PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
-PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
-PetstoreClient/Classes/OpenAPIs/Models/Name.swift
-PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
-PetstoreClient/Classes/OpenAPIs/Models/Order.swift
-PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
-PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
-PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
-PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
-PetstoreClient/Classes/OpenAPIs/Models/Return.swift
-PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
-PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
-PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
-PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
-PetstoreClient/Classes/OpenAPIs/Models/User.swift
 README.md
+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/Infrastructure/APIHelper.swift
+Sources/PetstoreClient/Infrastructure/APIs.swift
+Sources/PetstoreClient/Infrastructure/AlamofireImplementations.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/Validation.swift
+Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift
+Sources/PetstoreClient/Models/Animal.swift
+Sources/PetstoreClient/Models/ApiResponse.swift
+Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift
+Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift
+Sources/PetstoreClient/Models/ArrayTest.swift
+Sources/PetstoreClient/Models/Capitalization.swift
+Sources/PetstoreClient/Models/Cat.swift
+Sources/PetstoreClient/Models/Category.swift
+Sources/PetstoreClient/Models/ClassModel.swift
+Sources/PetstoreClient/Models/Client.swift
+Sources/PetstoreClient/Models/Dog.swift
+Sources/PetstoreClient/Models/EnumArrays.swift
+Sources/PetstoreClient/Models/EnumClass.swift
+Sources/PetstoreClient/Models/EnumTest.swift
+Sources/PetstoreClient/Models/File.swift
+Sources/PetstoreClient/Models/FileSchemaTestClass.swift
+Sources/PetstoreClient/Models/FormatTest.swift
+Sources/PetstoreClient/Models/HasOnlyReadOnly.swift
+Sources/PetstoreClient/Models/List.swift
+Sources/PetstoreClient/Models/MapTest.swift
+Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+Sources/PetstoreClient/Models/Model200Response.swift
+Sources/PetstoreClient/Models/Name.swift
+Sources/PetstoreClient/Models/NumberOnly.swift
+Sources/PetstoreClient/Models/Order.swift
+Sources/PetstoreClient/Models/OuterComposite.swift
+Sources/PetstoreClient/Models/OuterEnum.swift
+Sources/PetstoreClient/Models/Pet.swift
+Sources/PetstoreClient/Models/ReadOnlyFirst.swift
+Sources/PetstoreClient/Models/Return.swift
+Sources/PetstoreClient/Models/SpecialModelName.swift
+Sources/PetstoreClient/Models/Tag.swift
+Sources/PetstoreClient/Models/TypeHolderDefault.swift
+Sources/PetstoreClient/Models/TypeHolderExample.swift
+Sources/PetstoreClient/Models/User.swift
 docs/AdditionalPropertiesClass.md
 docs/Animal.md
 docs/AnotherFakeAPI.md

samples/client/petstore/swift6/apiNonStaticMethod/Package.swift

@@ -29,7 +29,7 @@ let package = Package(
         .target(
             name: "PetstoreClient",
             dependencies: ["Alamofire", "PromiseKit", "RxSwift"],
-            path: "PetstoreClient/Classes"
+            path: "Sources/PetstoreClient"
         ),
     ],
     swiftLanguageModes: [.v6]

samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/openapitools/openapi-generator'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/**/*.swift'
+  s.source_files = 'Sources/PetstoreClient/**/*.swift'
   s.dependency 'Alamofire', '~> 5.9'
   s.dependency 'PromiseKit/CorePromise', '~> 8.1'
   s.dependency 'RxSwift', '~> 6.7'