Skip to content

Commit 8f6c405

Browse files
committed
[Cleanup] Make Config's namingStrategy and accessModifier params consistent
1 parent f3c32cc commit 8f6c405

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

Sources/_OpenAPIGeneratorCore/Config.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public struct Config: Sendable {
7979
access: AccessModifier,
8080
additionalImports: [String] = [],
8181
filter: DocumentFilter? = nil,
82-
namingStrategy: NamingStrategy = Config.defaultNamingStrategy,
82+
namingStrategy: NamingStrategy,
8383
nameOverrides: [String: String] = [:],
8484
featureFlags: FeatureFlags = []
8585
) {

Tests/OpenAPIGeneratorReferenceTests/CompatabilityTest.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ fileprivate extension CompatibilityTest {
254254
for mode in GeneratorMode.allCases {
255255
group.addTask {
256256
let generator = makeGeneratorPipeline(
257-
config: Config(mode: mode, access: .public),
257+
config: Config(mode: mode, access: .public, namingStrategy: .defensive),
258258
diagnostics: diagnosticsCollector
259259
)
260260
return try assertNoThrowWithValue(generator.run(input))
@@ -265,7 +265,7 @@ fileprivate extension CompatibilityTest {
265265
} else {
266266
outputs = try GeneratorMode.allCases.map { mode in
267267
let generator = makeGeneratorPipeline(
268-
config: Config(mode: mode, access: .public),
268+
config: Config(mode: mode, access: .public, namingStrategy: .defensive),
269269
diagnostics: diagnosticsCollector
270270
)
271271
return try assertNoThrowWithValue(generator.run(input))

Tests/OpenAPIGeneratorReferenceTests/SnippetBasedReferenceTests.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5868,7 +5868,7 @@ extension SnippetBasedReferenceTests {
58685868
func makeTypesTranslator(openAPIDocumentYAML: String) throws -> TypesFileTranslator {
58695869
let document = try YAMLDecoder().decode(OpenAPI.Document.self, from: openAPIDocumentYAML)
58705870
return TypesFileTranslator(
5871-
config: Config(mode: .types, access: .public),
5871+
config: Config(mode: .types, access: .public, namingStrategy: .defensive),
58725872
diagnostics: XCTestDiagnosticCollector(test: self),
58735873
components: document.components
58745874
)
@@ -5901,7 +5901,12 @@ extension SnippetBasedReferenceTests {
59015901
components: OpenAPI.Components = .noComponents
59025902
) throws -> TypesFileTranslator {
59035903
TypesFileTranslator(
5904-
config: Config(mode: .types, access: accessModifier, featureFlags: featureFlags),
5904+
config: Config(
5905+
mode: .types,
5906+
access: accessModifier,
5907+
namingStrategy: .defensive,
5908+
featureFlags: featureFlags
5909+
),
59055910
diagnostics: XCTestDiagnosticCollector(test: self, ignoredDiagnosticMessages: ignoredDiagnosticMessages),
59065911
components: components
59075912
)
@@ -5915,17 +5920,17 @@ extension SnippetBasedReferenceTests {
59155920
let collector = XCTestDiagnosticCollector(test: self, ignoredDiagnosticMessages: ignoredDiagnosticMessages)
59165921
return (
59175922
TypesFileTranslator(
5918-
config: Config(mode: .types, access: .public, featureFlags: featureFlags),
5923+
config: Config(mode: .types, access: .public, namingStrategy: .defensive, featureFlags: featureFlags),
59195924
diagnostics: collector,
59205925
components: components
59215926
),
59225927
ClientFileTranslator(
5923-
config: Config(mode: .client, access: .public, featureFlags: featureFlags),
5928+
config: Config(mode: .client, access: .public, namingStrategy: .defensive, featureFlags: featureFlags),
59245929
diagnostics: collector,
59255930
components: components
59265931
),
59275932
ServerFileTranslator(
5928-
config: Config(mode: .server, access: .public, featureFlags: featureFlags),
5933+
config: Config(mode: .server, access: .public, namingStrategy: .defensive, featureFlags: featureFlags),
59295934
diagnostics: collector,
59305935
components: components
59315936
)

0 commit comments

Comments
 (0)