chore(Predictions): Cleanup build warnings (#1115)

royjit · web-flow · commit 3eb7f4845f0d · 2021-03-18T15:28:01.000-07:00
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin.swift
@@ -26,7 +26,7 @@ final public class AWSPredictionsPlugin: PredictionsCategoryPlugin {
 
     var config: PredictionsPluginConfiguration!
 
-    ///public limit rekognition has on number of faces it can detect.
+    /// public limit rekognition has on number of faces it can detect.
     public static let rekognitionMaxEntitiesLimit = 50
 
     /// The unique key of the plugin within the predictions category.
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Requests/PredictionsIdentifyRequest+Validate.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Requests/PredictionsIdentifyRequest+Validate.swift
@@ -11,7 +11,7 @@ import Amplify
 public extension PredictionsIdentifyRequest {
     /// Performs client side validation and returns a `PredictionsError` for any validation failures.
     func validate() -> PredictionsError? {
-        //TODO: implement
+        // TODO: implement
         return nil
     }
 }
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/CoreML/CoreMLPredictionService.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/CoreML/CoreMLPredictionService.swift
@@ -13,7 +13,7 @@ class CoreMLPredictionService: CoreMLPredictionBehavior {
 
     let coreMLPlugin: CoreMLPredictionsPlugin
 
-    init(configuration: Any) throws {
+    init(configuration: Any?) throws {
         self.coreMLPlugin = CoreMLPredictionsPlugin()
         try coreMLPlugin.configure(using: configuration)
     }
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/MultiService/IdentifyMultiService.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/MultiService/IdentifyMultiService.swift
@@ -110,9 +110,9 @@ class IdentifyMultiService: MultiServiceBehavior {
         let onlineLabelSet = Set<Label>(onlineLabelResult.labels)
         let offlineLabelSet = Set<Label>(offlineLabelResult.labels)
 
-        //first find the labels that are the same
+        // first find the labels that are the same
         let intersectingLabels = onlineLabelSet.intersection(offlineLabelSet)
-        //loop through to find higher confidences and retain those labels and add to final result
+        // loop through to find higher confidences and retain those labels and add to final result
         for label in intersectingLabels {
             let onlineIndex = onlineLabelSet.firstIndex(of: label)!
             let offlineIndex = offlineLabelSet.firstIndex(of: label)!
@@ -122,8 +122,8 @@ class IdentifyMultiService: MultiServiceBehavior {
             combinedLabels.insert(labelWithHigherConfidence)
         }
 
-        //get the differences
-        //leaving here for performance comparison
+        // get the differences
+        // leaving here for performance comparison
         // let differingLabels = Array(onlineLabelSet.symmetricDifference(offlineLabelSet))
         // combinedLabels.append(contentsOf: differingLabels)
         combinedLabels = combinedLabels.union(onlineLabelSet)
@@ -155,8 +155,8 @@ class IdentifyMultiService: MultiServiceBehavior {
         combinedLines = combinedLines.union(offlineLineSet)
         combinedLines = combinedLines.union(onlineLineSet)
 
-        //offline result doesn't return anything except identified lines so
-        //merging them plus the other stuff from online is a merged result
+        // offline result doesn't return anything except identified lines so
+        // merging them plus the other stuff from online is a merged result
         return IdentifyTextResult(fullText: onlineTextResult.fullText,
                                   words: onlineTextResult.words,
                                   rawLineText: onlineTextResult.rawLineText,
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Rekognition.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Rekognition.swift
@@ -13,6 +13,7 @@ typealias DetectModerationLabelsCompletedHandler = AWSTask<AWSRekognitionDetectM
 
 typealias DetectLabelsCompletedHandler = AWSTask<AWSRekognitionDetectLabelsResponse>
 
+// swiftlint:disable file_length
 extension AWSPredictionsService: AWSRekognitionServiceBehavior {
 
     func detectLabels(image: URL,
@@ -127,7 +128,7 @@ extension AWSPredictionsService: AWSRekognitionServiceBehavior {
 
     func detectEntities(image: URL, onEvent: @escaping AWSPredictionsService.RekognitionServiceEventHandler) {
         if let collectionId = predictionsConfig.identify.identifyEntities?.collectionId {
-            //call detect face from collection if collection id passed in
+            // call detect face from collection if collection id passed in
             return detectFacesFromCollection(image: image, collectionId: collectionId, onEvent: onEvent)
 
         }
@@ -267,8 +268,8 @@ extension AWSPredictionsService: AWSRekognitionServiceBehavior {
             }
             let identifyTextResult = IdentifyTextResultTransformers.processText(rekognitionTextDetections)
 
-            //if limit of words is under 50 return rekognition response
-            //otherwise call textract because their limit is higher
+            // if limit of words is under 50 return rekognition response
+            // otherwise call textract because their limit is higher
             if let words = identifyTextResult.words, words.count < self.rekognitionWordLimit {
                 onEvent(.completed(identifyTextResult))
                 return nil
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Transcribe.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Transcribe.swift
@@ -11,6 +11,7 @@ import AWSPluginsCore
 
 extension AWSPredictionsService: AWSTranscribeStreamingServiceBehavior {
 
+    // swiftlint:disable cyclomatic_complexity
     func transcribe(speechToText: URL, language: LanguageType?, onEvent: @escaping TranscribeServiceEventHandler) {
 
         guard let audioData = try? Data(contentsOf: speechToText) else {
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSRekognitionErrorMessage.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSRekognitionErrorMessage.swift
@@ -14,7 +14,7 @@ typealias AWSRekognitionErrorMessageString = (
 
 struct AWSRekognitionErrorMessage {
     static let accessDenied: AWSRekognitionErrorMessageString = (
-        "Access denied!",
+        "Access denied",
         "Please check that your Cognito IAM role has permissions to access Rekognition.")
 
     static let imageTooLarge: AWSRekognitionErrorMessageString = (
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSServiceErrorMessage.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSServiceErrorMessage.swift
@@ -12,7 +12,7 @@ typealias AWSServiceErrorMessageString = (errorDescription: ErrorDescription, re
 
 struct AWSServiceErrorMessage {
     static let accessDenied: AWSServiceErrorMessageString = (
-        "Access denied!",
+        "Access denied",
         """
         Please check that your Cognito IAM role has permissions to access this service and check to make sure the user
         is authenticated properly.
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSTextractErrorMessage.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSTextractErrorMessage.swift
@@ -12,7 +12,7 @@ typealias AWSTextractErrorString = (errorDescription: ErrorDescription, recovery
 
 struct AWSTextractErrorMessage {
     static let accessDenied: AWSTextractErrorString = (
-        "Access denied!",
+        "Access denied",
         "Please check that your Cognito IAM role has permissions to access Textract.")
 
     static let limitExceeded: AWSTextractErrorString = (
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSTranslateErrorMessage.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/AWSTranslateErrorMessage.swift
@@ -12,7 +12,7 @@ typealias AWSTranslateErrorMessageString = (errorDescription: ErrorDescription,
 
 struct AWSTranslateErrorMessage {
     static let accessDenied: AWSTranslateErrorMessageString = (
-        "Access denied! You do not have sufficient access to perform this action.",
+        "Access denied. You do not have sufficient access to perform this action.",
         "Please check that your Cognito IAM role has permissions to access Translate.")
 
     static let sourceLanguageNotProvided: AWSTranslateErrorMessageString = (
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/ConvertMultiServiceErrorMessage.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/ConvertMultiServiceErrorMessage.swift
@@ -12,7 +12,7 @@ typealias ConvertMultiServiceErrorString = (errorDescription: ErrorDescription,
 
 struct ConvertMultiServiceErrorMessage {
     static let accessDenied: ConvertMultiServiceErrorString = (
-        "Access denied!",
+        "Access denied",
         "")
 
     static let onlineConvertServiceNotAvailable: ConvertMultiServiceErrorString = (
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/InterpretMultiServiceErrorMessage.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Constants/InterpretMultiServiceErrorMessage.swift
@@ -12,7 +12,7 @@ typealias InterpretMultiServiceErrorString = (errorDescription: ErrorDescription
 
 struct InterpretMultiServiceErrorMessage {
     static let accessDenied: InterpretMultiServiceErrorString = (
-        "Access denied!",
+        "Access denied",
         "")
 
     static let onlineInterpretServiceNotAvailable: InterpretMultiServiceErrorString = (
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Internal/NativeWebSocketProvider.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Internal/NativeWebSocketProvider.swift
@@ -10,7 +10,7 @@ import AWSTranscribeStreaming
 
 class NativeWebSocketProvider: NSObject, AWSTranscribeStreamingWebSocketProvider, URLSessionWebSocketDelegate {
 
-    //swiftlint:disable weak_delegate
+    // swiftlint:disable weak_delegate
     var clientDelegate: AWSTranscribeStreamingClientDelegate
     var webSocketTask: URLSessionWebSocketTask!
     var urlSession: URLSession!
@@ -30,7 +30,7 @@ class NativeWebSocketProvider: NSObject, AWSTranscribeStreamingWebSocketProvider
             webSocketTask = urlSession.webSocketTask(with: url)
         }
     }
-    //required by protocol but not needed
+    // required by protocol but not needed
     func setDelegate(_ delegate: AWSTranscribeStreamingClientDelegate, dispatchQueue: DispatchQueue) {
 
     }
@@ -119,7 +119,7 @@ class NativeWebSocketProvider: NSObject, AWSTranscribeStreamingWebSocketProvider
         }
     }
 }
-//swiftlint:disable type_name
+// swiftlint:disable type_name
 class NativeWSTranscribeStreamingClientDelegate: NSObject, AWSTranscribeStreamingClientDelegate {
     var receiveEventCallback: ((AWSTranscribeStreamingTranscriptResultStream?, Error?) -> Void)?
     var connectionStatusCallback: ((AWSTranscribeStreamingClientConnectionStatus, Error?) -> Void)?
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Utils/IdentifyTextResultTransformers+KeyValueSet.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Utils/IdentifyTextResultTransformers+KeyValueSet.swift
@@ -80,6 +80,7 @@ extension IdentifyTextResultTransformers {
         return keyText.trimmingCharacters(in: .whitespacesAndNewlines)
     }
 
+    // swiftlint:disable cyclomatic_complexity
     static func processValueOfKeyValueSet(ids: [String],
                                           blockMap: [String: AWSTextractBlock]) -> (String, Bool) {
         var valueText = ""
@@ -112,7 +113,7 @@ extension IdentifyTextResultTransformers {
                     case .selectionElement:
                         if !selectionItemFound {
                             selectionItemFound = true
-                            //TODO: https://github.com/aws-amplify/amplify-ios/issues/695
+                            // TODO: https://github.com/aws-amplify/amplify-ios/issues/695
                             // Support multiple selection items found in a KeyValueSet
                             isSelected = selectionStatus == .selected
                         } else {
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Utils/IdentifyTextResultTransformers+Tables.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Support/Utils/IdentifyTextResultTransformers+Tables.swift
@@ -100,7 +100,7 @@ extension IdentifyTextResultTransformers {
                 case .selectionElement:
                     if !selectionItemFound {
                         selectionItemFound = true
-                        //TODO: https://github.com/aws-amplify/amplify-ios/issues/695
+                        // TODO: https://github.com/aws-amplify/amplify-ios/issues/695
                         // Support multiple selection items found in a KeyValueSet
                         isSelected = selectionStatus == .selected
                     } else {
diff --git a/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Dependency/CoreMLVisionAdapter.swift b/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Dependency/CoreMLVisionAdapter.swift
@@ -91,6 +91,7 @@ class CoreMLVisionAdapter: CoreMLVisionBehavior {
         return IdentifyEntitiesResult(entities: entities)
     }
 
+    // swiftlint:disable cyclomatic_complexity
     private func mapLandmarks(_ coreMLLandmarks: VNFaceLandmarks2D?) -> [Landmark] {
         var finalLandmarks: [Landmark] = []
         guard let landmarks = coreMLLandmarks else {
diff --git a/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Operation/CoreMLIdentifyOperation.swift b/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Operation/CoreMLIdentifyOperation.swift
@@ -27,6 +27,7 @@ public class CoreMLIdentifyOperation: AmplifyOperation<
                    resultListener: resultListener)
     }
 
+    // swiftlint:disable cyclomatic_complexity
     override public func main() {
 
         guard let coreMLVisionAdapter = coreMLVision else {
@@ -77,7 +78,7 @@ public class CoreMLIdentifyOperation: AmplifyOperation<
             dispatch(result: .success(result))
             finish()
         case .detectLabels(let labelType):
-            if labelType == .moderation { //coreml does not have an endpoint to detect moderation labels in images
+            if labelType == .moderation { // coreml does not have an endpoint to detect moderation labels in images
                 let errorDescription = CoreMLPluginErrorString.operationNotSupported.errorDescription
                 let recovery = CoreMLPluginErrorString.operationNotSupported.recoverySuggestion
                 let predictionsError = PredictionsError.service(errorDescription, recovery, nil)
diff --git a/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Operation/CoreMLInterpretTextOperation.swift b/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Operation/CoreMLInterpretTextOperation.swift
@@ -38,11 +38,6 @@ public class CoreMLInterpretTextOperation: AmplifyOperation<
             return
         }
 
-        if isCancelled {
-            finish()
-            return
-        }
-
         var interpretResultBuilder = InterpretResult.Builder()
         if let dominantLanguage = naturalLanguageAdapter.detectDominantLanguage(for: request.textToInterpret) {
             let languageResult = LanguageDetectionResult(languageCode: dominantLanguage, score: nil)
diff --git a/AmplifyPlugins/Predictions/Podfile.lock b/AmplifyPlugins/Predictions/Podfile.lock
@@ -17,38 +17,38 @@ PODS:
     - AWSCore (~> 2.23.0)
     - AWSMobileClient (~> 2.23.0)
     - AWSPluginsCore (= 1.6.1)
-  - AWSAuthCore (2.23.0):
-    - AWSCore (= 2.23.0)
-  - AWSCognitoIdentityProvider (2.23.0):
-    - AWSCognitoIdentityProviderASF (= 2.23.0)
-    - AWSCore (= 2.23.0)
-  - AWSCognitoIdentityProviderASF (2.23.0)
-  - AWSComprehend (2.23.0):
-    - AWSCore (= 2.23.0)
-  - AWSCore (2.23.0)
-  - AWSMobileClient (2.23.0):
-    - AWSAuthCore (= 2.23.0)
-    - AWSCognitoIdentityProvider (= 2.23.0)
-    - AWSCognitoIdentityProviderASF (= 2.23.0)
-    - AWSCore (= 2.23.0)
+  - AWSAuthCore (2.23.1):
+    - AWSCore (= 2.23.1)
+  - AWSCognitoIdentityProvider (2.23.1):
+    - AWSCognitoIdentityProviderASF (= 2.23.1)
+    - AWSCore (= 2.23.1)
+  - AWSCognitoIdentityProviderASF (2.23.1)
+  - AWSComprehend (2.23.1):
+    - AWSCore (= 2.23.1)
+  - AWSCore (2.23.1)
+  - AWSMobileClient (2.23.1):
+    - AWSAuthCore (= 2.23.1)
+    - AWSCognitoIdentityProvider (= 2.23.1)
+    - AWSCognitoIdentityProviderASF (= 2.23.1)
+    - AWSCore (= 2.23.1)
   - AWSPluginsCore (1.6.1):
     - Amplify (= 1.6.1)
     - AWSCore (~> 2.23.0)
-  - AWSPolly (2.23.0):
-    - AWSCore (= 2.23.0)
-  - AWSRekognition (2.23.0):
-    - AWSCore (= 2.23.0)
-  - AWSTextract (2.23.0):
-    - AWSCore (= 2.23.0)
-  - AWSTranscribeStreaming (2.23.0):
-    - AWSCore (= 2.23.0)
-  - AWSTranslate (2.23.0):
-    - AWSCore (= 2.23.0)
+  - AWSPolly (2.23.1):
+    - AWSCore (= 2.23.1)
+  - AWSRekognition (2.23.1):
+    - AWSCore (= 2.23.1)
+  - AWSTextract (2.23.1):
+    - AWSCore (= 2.23.1)
+  - AWSTranscribeStreaming (2.23.1):
+    - AWSCore (= 2.23.1)
+  - AWSTranslate (2.23.1):
+    - AWSCore (= 2.23.1)
   - CwlCatchException (1.0.2)
   - CwlPreconditionTesting (1.1.1):
     - CwlCatchException
   - SwiftFormat/CLI (0.44.17)
-  - SwiftLint (0.42.0)
+  - SwiftLint (0.43.1)
 
 DEPENDENCIES:
   - Amplify (from `../../`)
@@ -110,22 +110,22 @@ SPEC CHECKSUMS:
   Amplify: 4d0c3b0871e1f268c81ce5e9b65532df0a013900
   AmplifyPlugins: 51dfaeafe662cd571c4d4dfd3bdc5987fef2d5a7
   AmplifyTestCommon: df44b4bffc133d0ef5abbc14109ba5dd1c7f4cbe
-  AWSAuthCore: 037e5faef3f7a0b4501eddcc382f9c74a22c0a77
-  AWSCognitoIdentityProvider: c078ed88e0f8d2df52850acfa2dae91c451ae47e
-  AWSCognitoIdentityProviderASF: fa862263b46ce6dcd28b85a906d21874fb28b15a
-  AWSComprehend: b9119850c737b9a729dfa02f1c78b66b7377af04
-  AWSCore: 589ad0bd5b72e9a95ce33834f12339b50cfc9f14
-  AWSMobileClient: 5701d5ac51ec0de781d848754f9d9952ead1c639
+  AWSAuthCore: d9f9c418df00f45f399e407dc6c2bce33870b0af
+  AWSCognitoIdentityProvider: 8bf316cc96554d4c88ca4b1dcae0589923fb95f5
+  AWSCognitoIdentityProviderASF: f9b0d373dfce6d5395f0b69f2301f5db927d9fc8
+  AWSComprehend: 0d6e0fe7a518a446f49a5e3b8eae21a8a303f395
+  AWSCore: 48bf561f5fb3616ef42c1f7f3eeb4b502d11f69d
+  AWSMobileClient: ffe1179b9e6d5db7cea3f807df7d47f5d00a5c65
   AWSPluginsCore: f41f8a478fe3fd8839ec16278b86dededefb0628
-  AWSPolly: 2bcc4a629e393d82681fe6884021fcb548a0b777
-  AWSRekognition: a1f96ffe039ad95073a4698a9f644e858001b42a
-  AWSTextract: 0385a8c7e07f68c74e86e2655785b9e30362465c
-  AWSTranscribeStreaming: 7a9c9c17c0a51922dfc9e4f726063ccf23b36e4d
-  AWSTranslate: 1f74325988e68f8eb1c6e21c5179a141c645e8fd
+  AWSPolly: 09e5d8ca52f45609df7bfee25300ff624642bbf2
+  AWSRekognition: f8f346a25d4a8d98840847a6a61dc7c1cc026520
+  AWSTextract: fcb83903e814c3656a837ccc17aa752ef2b78180
+  AWSTranscribeStreaming: f47fbf1183b38330e14c254f0f4a31c4a2f21fba
+  AWSTranslate: 62f2dfc44201186ba315942f189fbc582c738ace
   CwlCatchException: 70a52ae44ea5d46db7bd385f801a94942420cd8c
   CwlPreconditionTesting: d33a4e4f285c0b885fddcae5dfedfbb34d4f3961
   SwiftFormat: 3b5caa6389b2b9adbc00e133b3ccc8c6e687a6a4
-  SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d
+  SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
 
 PODFILE CHECKSUM: 65cca76c6059f8ccc8628936971fb9e4b035fb10
 
diff --git a/AmplifyPlugins/Predictions/PredictionsCategoryPlugin.xcodeproj/project.pbxproj b/AmplifyPlugins/Predictions/PredictionsCategoryPlugin.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import Amplify`
`11`	`11`	`public extension PredictionsIdentifyRequest {`
`12`	`12`	/// Performs client side validation and returns a `PredictionsError` for any validation failures.
`13`	`13`	`func validate() -> PredictionsError? {`
`14`		`- //TODO: implement`
	`14`	`+ // TODO: implement`
`15`	`15`	`return nil`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class CoreMLPredictionService: CoreMLPredictionBehavior {`
`13`	`13`
`14`	`14`	`let coreMLPlugin: CoreMLPredictionsPlugin`
`15`	`15`
`16`		`- init(configuration: Any) throws {`
	`16`	`+ init(configuration: Any?) throws {`
`17`	`17`	`self.coreMLPlugin = CoreMLPredictionsPlugin()`
`18`	`18`	`try coreMLPlugin.configure(using: configuration)`
`19`	`19`	`}`