chore: add reusable validation methods (#43)

momentohq · Nov 16, 2023 · 3d67278 · 3d67278
1 parent ef0558e
commit 3d67278
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 24 deletions.
diff --git a/Sources/momento/TopicClient.swift b/Sources/momento/TopicClient.swift
@@ -43,16 +43,17 @@ public class TopicClient: TopicClientProtocol {
         topicName: String,
         value: String
     ) async -> TopicPublishResponse {
-        if cacheName.count < 1 {
-            return TopicPublishError(
-                error: InvalidArgumentError(message: "Must provide a cache name")
-            )
-        }
-        if topicName.count < 1 {
-            return TopicPublishError(
-                error: InvalidArgumentError(message: "Must provide a topic name")
+        do {
+            try validateCacheName(cacheName: cacheName)
+            try validateTopicName(topicName: topicName)
+        } catch let err as SdkError {
+            return TopicPublishError(error: err)
+        } catch {
+            return TopicPublishError(error: UnknownError(
+                message: "unexpected error: \(error)")
             )
         }
+
         do {
             let result = try await self.pubsubClient.publish(
                 cacheName: cacheName,
@@ -75,16 +76,17 @@ public class TopicClient: TopicClientProtocol {
         topicName: String,
         value: Data
     ) async -> TopicPublishResponse {
-        if cacheName.count < 1 {
-            return TopicPublishError(
-                error: InvalidArgumentError(message: "Must provide a cache name")
-            )
-        }
-        if topicName.count < 1 {
-            return TopicPublishError(
-                error: InvalidArgumentError(message: "Must provide a topic name")
+        do {
+            try validateCacheName(cacheName: cacheName)
+            try validateTopicName(topicName: topicName)
+        } catch let err as SdkError {
+            return TopicPublishError(error: err)
+        } catch {
+            return TopicPublishError(error: UnknownError(
+                message: "unexpected error: \(error)")
             )
         }
+
         do {
             let result = try await self.pubsubClient.publish(
                 cacheName: cacheName,
@@ -103,16 +105,17 @@ public class TopicClient: TopicClientProtocol {
     }
 
     public func subscribe(cacheName: String, topicName: String) async -> TopicSubscribeResponse {
-        if cacheName.count < 1 {
-            return TopicSubscribeError(
-                error: InvalidArgumentError(message: "Must provide a cache name")
-            )
-        }
-        if topicName.count < 1 {
-            return TopicSubscribeError(
-                error: InvalidArgumentError(message: "Must provide a topic name")
+        do {
+            try validateCacheName(cacheName: cacheName)
+            try validateTopicName(topicName: topicName)
+        } catch let err as SdkError {
+            return TopicSubscribeError(error: err)
+        } catch {
+            return TopicSubscribeError(error: UnknownError(
+                message: "unexpected error: \(error)")
             )
         }
+
         do {
             let result = try await self.pubsubClient.subscribe(
                 cacheName: cacheName, 

diff --git a/Sources/momento/internal/utils/validators.swift b/Sources/momento/internal/utils/validators.swift
@@ -0,0 +1,19 @@
+extension String {
+  var isBlank: Bool {
+    return allSatisfy({ $0.isWhitespace })
+  }
+}
+
+private func validateString(str: String, errorMessage: String) throws {
+    if str.isBlank || str.isEmpty {
+        throw InvalidArgumentError(message: errorMessage)
+    }
+}
+
+internal func validateCacheName(cacheName: String) throws {
+    try validateString(str: cacheName, errorMessage: "Invalid cache name")
+}
+
+internal func validateTopicName(topicName: String) throws {
+    try validateString(str: topicName, errorMessage: "Invalid topic name")
+}