Skip to content

Commit 62c01ad

Browse files
committed
Run lint fixes
Signed-off-by: jescriba <[email protected]>
1 parent 65f9af2 commit 62c01ad

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

Sources/OpenFeature/Provider/MultiProvider/MultiProvider.swift

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class MultiProvider: FeatureProvider {
2323
) {
2424
self.providers = providers
2525
self.strategy = strategy
26-
self.metadata = MultiProviderMetadata(providers: providers)
26+
metadata = MultiProviderMetadata(providers: providers)
2727
}
2828

2929
public func initialize(initialContext: EvaluationContext?) async throws {
@@ -57,7 +57,7 @@ public class MultiProvider: FeatureProvider {
5757
defaultValue: defaultValue,
5858
evaluationContext: context
5959
) { provider in
60-
return provider.getBooleanEvaluation(key:defaultValue:context:)
60+
provider.getBooleanEvaluation(key:defaultValue:context:)
6161
}
6262
}
6363

@@ -70,7 +70,7 @@ public class MultiProvider: FeatureProvider {
7070
defaultValue: defaultValue,
7171
evaluationContext: context
7272
) { provider in
73-
return provider.getStringEvaluation(key:defaultValue:context:)
73+
provider.getStringEvaluation(key:defaultValue:context:)
7474
}
7575
}
7676

@@ -83,7 +83,7 @@ public class MultiProvider: FeatureProvider {
8383
defaultValue: defaultValue,
8484
evaluationContext: context
8585
) { provider in
86-
return provider.getIntegerEvaluation(key:defaultValue:context:)
86+
provider.getIntegerEvaluation(key:defaultValue:context:)
8787
}
8888
}
8989

@@ -96,7 +96,7 @@ public class MultiProvider: FeatureProvider {
9696
defaultValue: defaultValue,
9797
evaluationContext: context
9898
) { provider in
99-
return provider.getDoubleEvaluation(key:defaultValue:context:)
99+
provider.getDoubleEvaluation(key:defaultValue:context:)
100100
}
101101
}
102102

@@ -109,7 +109,7 @@ public class MultiProvider: FeatureProvider {
109109
defaultValue: defaultValue,
110110
evaluationContext: context
111111
) { provider in
112-
return provider.getObjectEvaluation(key:defaultValue:context:)
112+
provider.getObjectEvaluation(key:defaultValue:context:)
113113
}
114114
}
115115

@@ -119,11 +119,12 @@ public class MultiProvider: FeatureProvider {
119119

120120
public struct MultiProviderMetadata: ProviderMetadata {
121121
public var name: String?
122-
122+
123123
init(providers: [FeatureProvider]) {
124-
self.name = providers.map({
124+
name = providers.map {
125125
$0.metadata.name ?? "MultiProvider"
126-
}).joined(separator: ", ")
126+
}
127+
.joined(separator: ", ")
127128
}
128129
}
129130
}

Tests/OpenFeatureTests/DeveloperExperienceTests.swift

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,22 +201,19 @@ final class DeveloperExperienceTests: XCTestCase {
201201
getBooleanEvaluation: { _, _, _ in throw OpenFeatureError.generalError(message: "test error") },
202202
observe: { mockEvent2Subject.eraseToAnyPublisher() }
203203
)
204-
205204
// Create MultiProvider with both providers
206205
let multiProvider = MultiProvider(providers: [eventEmittingProvider1, eventEmittingProvider2])
207-
208206
// Set up expectations for different events
209207
let readyExpectation = XCTestExpectation(description: "Ready event received")
210208
let configChangedExpectation = XCTestExpectation(description: "Configuration changed event received")
211209
let errorExpectation = XCTestExpectation(description: "Error event received")
212-
210+
213211
var receivedEvents: [ProviderEvent] = []
214-
215212
// Observe events from MultiProvider
216213
let observer = multiProvider.observe().sink { event in
217214
guard let event = event else { return }
218215
receivedEvents.append(event)
219-
216+
220217
switch event {
221218
case .ready:
222219
readyExpectation.fulfill()
@@ -228,26 +225,25 @@ final class DeveloperExperienceTests: XCTestCase {
228225
break
229226
}
230227
}
231-
228+
232229
// Set the MultiProvider in OpenFeatureAPI to test integration
233230
await OpenFeatureAPI.shared.setProviderAndWait(provider: multiProvider)
234-
231+
235232
// Emit events from the first provider
236233
mockEvent1Subject.send(.ready)
237234
mockEvent1Subject.send(.configurationChanged)
238-
235+
239236
// Emit events from the second provider
240237
mockEvent2Subject.send(.error(errorCode: .general, message: "Test error"))
241-
242238
// Wait for all events to be received
243239
await fulfillment(of: [readyExpectation, configChangedExpectation, errorExpectation], timeout: 2)
244-
240+
245241
// Verify that events from both providers were received
246242
XCTAssertTrue(receivedEvents.contains(.ready))
247243
XCTAssertTrue(receivedEvents.contains(.configurationChanged))
248244
XCTAssertTrue(receivedEvents.contains(.error(errorCode: .general, message: "Test error")))
249245
XCTAssertGreaterThanOrEqual(receivedEvents.count, 3)
250-
246+
251247
observer.cancel()
252248
}
253249
}

0 commit comments

Comments
 (0)