[Cleanup] Make Config's namingStrategy and accessModifier params cons…

…istent
apple · Jan 6, 2025 · 8f6c405 · 8f6c405
1 parent f3c32cc
commit 8f6c405
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/Sources/_OpenAPIGeneratorCore/Config.swift b/Sources/_OpenAPIGeneratorCore/Config.swift
@@ -79,7 +79,7 @@ public struct Config: Sendable {
         access: AccessModifier,
         additionalImports: [String] = [],
         filter: DocumentFilter? = nil,
-        namingStrategy: NamingStrategy = Config.defaultNamingStrategy,
+        namingStrategy: NamingStrategy,
         nameOverrides: [String: String] = [:],
         featureFlags: FeatureFlags = []
     ) {

diff --git a/Tests/OpenAPIGeneratorReferenceTests/CompatabilityTest.swift b/Tests/OpenAPIGeneratorReferenceTests/CompatabilityTest.swift
@@ -254,7 +254,7 @@ fileprivate extension CompatibilityTest {
                 for mode in GeneratorMode.allCases {
                     group.addTask {
                         let generator = makeGeneratorPipeline(
-                            config: Config(mode: mode, access: .public),
+                            config: Config(mode: mode, access: .public, namingStrategy: .defensive),
                             diagnostics: diagnosticsCollector
                         )
                         return try assertNoThrowWithValue(generator.run(input))
@@ -265,7 +265,7 @@ fileprivate extension CompatibilityTest {
         } else {
             outputs = try GeneratorMode.allCases.map { mode in
                 let generator = makeGeneratorPipeline(
-                    config: Config(mode: mode, access: .public),
+                    config: Config(mode: mode, access: .public, namingStrategy: .defensive),
                     diagnostics: diagnosticsCollector
                 )
                 return try assertNoThrowWithValue(generator.run(input))

diff --git a/Tests/OpenAPIGeneratorReferenceTests/SnippetBasedReferenceTests.swift b/Tests/OpenAPIGeneratorReferenceTests/SnippetBasedReferenceTests.swift
@@ -5868,7 +5868,7 @@ extension SnippetBasedReferenceTests {
     func makeTypesTranslator(openAPIDocumentYAML: String) throws -> TypesFileTranslator {
         let document = try YAMLDecoder().decode(OpenAPI.Document.self, from: openAPIDocumentYAML)
         return TypesFileTranslator(
-            config: Config(mode: .types, access: .public),
+            config: Config(mode: .types, access: .public, namingStrategy: .defensive),
             diagnostics: XCTestDiagnosticCollector(test: self),
             components: document.components
         )
@@ -5901,7 +5901,12 @@ extension SnippetBasedReferenceTests {
         components: OpenAPI.Components = .noComponents
     ) throws -> TypesFileTranslator {
         TypesFileTranslator(
-            config: Config(mode: .types, access: accessModifier, featureFlags: featureFlags),
+            config: Config(
+                mode: .types,
+                access: accessModifier,
+                namingStrategy: .defensive,
+                featureFlags: featureFlags
+            ),
             diagnostics: XCTestDiagnosticCollector(test: self, ignoredDiagnosticMessages: ignoredDiagnosticMessages),
             components: components
         )
@@ -5915,17 +5920,17 @@ extension SnippetBasedReferenceTests {
         let collector = XCTestDiagnosticCollector(test: self, ignoredDiagnosticMessages: ignoredDiagnosticMessages)
         return (
             TypesFileTranslator(
-                config: Config(mode: .types, access: .public, featureFlags: featureFlags),
+                config: Config(mode: .types, access: .public, namingStrategy: .defensive, featureFlags: featureFlags),
                 diagnostics: collector,
                 components: components
             ),
             ClientFileTranslator(
-                config: Config(mode: .client, access: .public, featureFlags: featureFlags),
+                config: Config(mode: .client, access: .public, namingStrategy: .defensive, featureFlags: featureFlags),
                 diagnostics: collector,
                 components: components
             ),
             ServerFileTranslator(
-                config: Config(mode: .server, access: .public, featureFlags: featureFlags),
+                config: Config(mode: .server, access: .public, namingStrategy: .defensive, featureFlags: featureFlags),
                 diagnostics: collector,
                 components: components
             )