Skip to content

Commit 7f09356

Browse files
committed
Moved AutoOffsetReset to ConsumerConfig (only used there)
1 parent 27c98d2 commit 7f09356

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

Sources/SwiftKafka/New/ClientConfig.swift

-11
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
// TODO: DocC: inherit documentation?
1919
// TODO: DocC: take from lirbdkafka official documentation
2020
// TODO: Topic config -> see KafkaConfig in SwiftKafka
21-
// TODO: create empty init for substructs to disable free initializer?
2221
// TODO: test that values get set accordingly
2322
// TODO: remove old config tests
24-
// TODO: magic nums for default values?
2523
public protocol ClientConfig: Hashable, Equatable {
2624
// TODO: docc
2725
var properties: [String: String] { set get }
@@ -277,13 +275,4 @@ extension ClientConfig {
277275
}
278276
return ConfigEnums.SASLMechanism(description: value)
279277
}
280-
281-
// TODO: move to Consumer
282-
func getAutoOffsetReset() -> ConfigEnums.AutoOffsetReset? {
283-
guard let value = properties["auto.offset.reset"] else {
284-
return nil
285-
}
286-
return ConfigEnums.AutoOffsetReset(description: value)
287-
}
288278
}
289-

Sources/SwiftKafka/New/ConfigEnums.swift

-14
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
// TODO: docc
1616
public struct ConfigEnums {
17-
1817
public struct DebugOption: Hashable, Equatable, CustomStringConvertible {
1918
public let description: String
2019

@@ -63,17 +62,4 @@ public struct ConfigEnums {
6362
public static let scramSHA512 = SASLMechanism(description: "SCRAM-SHA-512")
6463
public static let oauthbearer = SASLMechanism(description: "OAUTHBEARER")
6564
}
66-
67-
// TODO: move to consumer? -> only used there
68-
public struct AutoOffsetReset: Hashable, Equatable, CustomStringConvertible {
69-
public let description: String
70-
71-
public static let smallest = AutoOffsetReset(description: "smallest")
72-
public static let earliest = AutoOffsetReset(description: "earliest")
73-
public static let beginning = AutoOffsetReset(description: "beginning")
74-
public static let largest = AutoOffsetReset(description: "largest")
75-
public static let latest = AutoOffsetReset(description: "latest")
76-
public static let end = AutoOffsetReset(description: "end")
77-
public static let error = AutoOffsetReset(description: "error")
78-
}
7965
}

Sources/SwiftKafka/New/ConsumerConfig.swift

+26
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,30 @@ public struct ConsumerConfig: ClientConfig {
161161
self.saslUsername = saslUsername
162162
self.saslPassword = saslPassword
163163
}
164+
165+
// MARK: - Helpers
166+
167+
func getAutoOffsetReset() -> ConfigEnums.AutoOffsetReset? {
168+
guard let value = properties["auto.offset.reset"] else {
169+
return nil
170+
}
171+
return ConfigEnums.AutoOffsetReset(description: value)
172+
}
173+
}
174+
175+
// MARK: - ConfigEnums + AutoOffsetReset
176+
177+
extension ConfigEnums {
178+
// TODO: docc
179+
public struct AutoOffsetReset: Hashable, Equatable, CustomStringConvertible {
180+
public let description: String
181+
182+
public static let smallest = AutoOffsetReset(description: "smallest")
183+
public static let earliest = AutoOffsetReset(description: "earliest")
184+
public static let beginning = AutoOffsetReset(description: "beginning")
185+
public static let largest = AutoOffsetReset(description: "largest")
186+
public static let latest = AutoOffsetReset(description: "latest")
187+
public static let end = AutoOffsetReset(description: "end")
188+
public static let error = AutoOffsetReset(description: "error")
189+
}
164190
}

0 commit comments

Comments
 (0)