[MOB-800] Nullability and clang-format clean up.

bazaarvoice · Dec 4, 2017 · b659026 · b659026
1 parent 0f7b490
commit b659026
Show file tree

Hide file tree

Showing 510 changed files with 22,329 additions and 18,869 deletions.
diff --git a/.clang_format b/.clang_format
@@ -2,11 +2,11 @@ BasedOnStyle: Google
 AlignTrailingComments: true
 BreakBeforeBraces: Attach
 ColumnLimit: 80
+PointerBindsToType: false
 IndentWidth: 4
 KeepEmptyLinesAtTheStartOfBlocks: false
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
-PointerBindsToType: false
 SpacesBeforeTrailingComments: 1
 TabWidth: 8
 UseTab: Never
diff --git a/.format.sh b/.format.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for DIRECTORY in Pod Examples Tests/Tests
+do
+	echo "Formatting code under $DIRECTORY/"
+	find "$DIRECTORY" \( -name '*.h' -or -name '*.m' -or -name '*.mm' \) -print0 | xargs -0 "clang-format" -i
+done
diff --git a/BVSDK.xcodeproj/project.pbxproj b/BVSDK.xcodeproj/project.pbxproj
@@ -458,7 +458,6 @@
 		87F2DD481DAD585E00FB43F3 /* BVShopperProfileRequestCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 87F2DC161DAD585E00FB43F3 /* BVShopperProfileRequestCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		87F2DD4B1DAD589800FB43F3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87F2DD4A1DAD589800FB43F3 /* UIKit.framework */; };
 		87F2DD4D1DAD589E00FB43F3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87F2DD4C1DAD589E00FB43F3 /* Foundation.framework */; };
-		87F2DD501DAD592A00FB43F3 /* Gimbal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87F2DD4F1DAD592A00FB43F3 /* Gimbal.framework */; };
 		87F2DD521DAD597C00FB43F3 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 87F2DD511DAD597C00FB43F3 /* libz.tbd */; };
 		87F2DD5E1DAD5E9400FB43F3 /* BVBaseStubTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 87F2DD551DAD5E9400FB43F3 /* BVBaseStubTestCase.m */; };
 		87F2DD601DAD5E9400FB43F3 /* BVCurationsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 87F2DD571DAD5E9400FB43F3 /* BVCurationsTests.m */; };
@@ -539,6 +538,7 @@
 		B575C38F1FBE1A4F000F890B /* BVUASSubmissionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B575C38D1FBE1A4F000F890B /* BVUASSubmissionResponse.m */; };
 		B575C3921FBE2479000F890B /* BVSubmittedUAS.h in Headers */ = {isa = PBXBuildFile; fileRef = B575C3901FBE2479000F890B /* BVSubmittedUAS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B575C3931FBE2479000F890B /* BVSubmittedUAS.m in Sources */ = {isa = PBXBuildFile; fileRef = B575C3911FBE2479000F890B /* BVSubmittedUAS.m */; };
+		B5E1F5331FD5F2F0000F5DB5 /* Gimbal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5E1F5321FD5F2F0000F5DB5 /* Gimbal.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -996,7 +996,6 @@
 		87F2DC161DAD585E00FB43F3 /* BVShopperProfileRequestCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BVShopperProfileRequestCache.h; sourceTree = "<group>"; };
 		87F2DD4A1DAD589800FB43F3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		87F2DD4C1DAD589E00FB43F3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		87F2DD4F1DAD592A00FB43F3 /* Gimbal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Gimbal.framework; sourceTree = "<group>"; };
 		87F2DD511DAD597C00FB43F3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		87F2DD541DAD5E9400FB43F3 /* BVBaseStubTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVBaseStubTestCase.h; path = Tests/Tests/BVBaseStubTestCase.h; sourceTree = SOURCE_ROOT; };
 		87F2DD551DAD5E9400FB43F3 /* BVBaseStubTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVBaseStubTestCase.m; path = Tests/Tests/BVBaseStubTestCase.m; sourceTree = SOURCE_ROOT; };
@@ -1079,6 +1078,7 @@
 		B575C38D1FBE1A4F000F890B /* BVUASSubmissionResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BVUASSubmissionResponse.m; path = ../Auth/BVUASSubmissionResponse.m; sourceTree = "<group>"; };
 		B575C3901FBE2479000F890B /* BVSubmittedUAS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BVSubmittedUAS.h; path = ../Auth/BVSubmittedUAS.h; sourceTree = "<group>"; };
 		B575C3911FBE2479000F890B /* BVSubmittedUAS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BVSubmittedUAS.m; path = ../Auth/BVSubmittedUAS.m; sourceTree = "<group>"; };
+		B5E1F5321FD5F2F0000F5DB5 /* Gimbal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Gimbal.framework; path = Frameworks/Gimbal.framework; sourceTree = SOURCE_ROOT; };
 		EC098EFAFB725736F0751BA0 /* libPods-BVSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BVSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -1091,7 +1091,7 @@
 				87F2DD521DAD597C00FB43F3 /* libz.tbd in Frameworks */,
 				87F2DD4D1DAD589E00FB43F3 /* Foundation.framework in Frameworks */,
 				87F2DD4B1DAD589800FB43F3 /* UIKit.framework in Frameworks */,
-				87F2DD501DAD592A00FB43F3 /* Gimbal.framework in Frameworks */,
+				B5E1F5331FD5F2F0000F5DB5 /* Gimbal.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1919,10 +1919,10 @@
 			isa = PBXGroup;
 			children = (
 				87F2DD511DAD597C00FB43F3 /* libz.tbd */,
-				87F2DD4F1DAD592A00FB43F3 /* Gimbal.framework */,
+				B5E1F5321FD5F2F0000F5DB5 /* Gimbal.framework */,
 			);
 			name = "3rd Party Frameworks";
-			path = Pod/Frameworks;
+			path = Frameworks;
 			sourceTree = "<group>";
 		};
 		87F2DD651DAD698400FB43F3 /* conversations */ = {
@@ -2999,7 +2999,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Pod/Frameworks",
+					"$(PROJECT_DIR)/Frameworks",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -3026,7 +3026,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Pod/Frameworks",
+					"$(PROJECT_DIR)/Frameworks",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";

diff --git a/BVSDK/BVSDK.h b/BVSDK/BVSDK.h
@@ -13,155 +13,152 @@ FOUNDATION_EXPORT double BVSDKVersionNumber;
 //! Project version string for BVSDK.
 FOUNDATION_EXPORT const unsigned char BVSDKVersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import <BVSDK/PublicHeader.h>
+// In this header, you should import all the public headers of your framework
+// using statements like #import <BVSDK/PublicHeader.h>
 
 // Core
 #import <BVSDK/BVCommaUtil.h>
-#import <BVSDK/BVViewsHelper.h>
 #import <BVSDK/BVDiagnosticHelpers.h>
+#import <BVSDK/BVViewsHelper.h>
 
 // Notifications
-#import <BVSDK/BVNotifications.h>
-#import <BVSDK/BVNotificationProperties.h>
 #import <BVSDK/BVNotificationCenterObject.h>
 #import <BVSDK/BVNotificationConfiguration.h>
 #import <BVSDK/BVNotificationConstants.h>
-#import <BVSDK/BVProductReviewNotificationCenter.h>
-#import <BVSDK/BVStoreReviewNotificationCenter.h>
-#import <BVSDK/BVStoreReviewRichNotificationCenter.h>
+#import <BVSDK/BVNotificationProperties.h>
+#import <BVSDK/BVNotificationViewController.h>
+#import <BVSDK/BVNotifications.h>
 #import <BVSDK/BVNotificationsAnalyticsHelper.h>
 #import <BVSDK/BVOpenUrlMetaData.h>
 #import <BVSDK/BVProductReviewNotificationCenter.h>
-#import <BVSDK/BVStoreReviewNotificationCenter.h>
-#import <BVSDK/BVStoreReviewNotificationProperties.h>
-#import <BVSDK/BVStoreNotificationConfigurationLoader.h>
 #import <BVSDK/BVProductReviewNotificationConfigurationLoader.h>
-#import <BVSDK/BVNotificationViewController.h>
-#import <BVSDK/BVStoreReviewSimpleNotificationCenter.h>
 #import <BVSDK/BVProductReviewRichNotificationCenter.h>
 #import <BVSDK/BVProductReviewSimpleNotificationCenter.h>
+#import <BVSDK/BVStoreNotificationConfigurationLoader.h>
+#import <BVSDK/BVStoreReviewNotificationCenter.h>
+#import <BVSDK/BVStoreReviewNotificationProperties.h>
+#import <BVSDK/BVStoreReviewRichNotificationCenter.h>
+#import <BVSDK/BVStoreReviewSimpleNotificationCenter.h>
 
 // Analytics
-#import <BVSDK/BVBaseAnalyticsHelper.h>
 #import <BVSDK/BVAnalyticEventManager.h>
+#import <BVSDK/BVBaseAnalyticsHelper.h>
 
 // Conversations
-#import <BVSDK/BVSubmissionErrorResponse.h>
+#import <BVSDK/BVAuthor.h>
 #import <BVSDK/BVConversationsErrorResponse.h>
 #import <BVSDK/BVConversationsInclude.h>
 #import <BVSDK/BVFilter.h>
 #import <BVSDK/BVFormField.h>
 #import <BVSDK/BVFormFieldOptions.h>
 #import <BVSDK/BVProduct.h>
-#import <BVSDK/BVAuthor.h>
+#import <BVSDK/BVSubmissionErrorResponse.h>
 
+#import <BVSDK/BVConversationsError.h>
 #import <BVSDK/BVConversationsErrorResponse.h>
 #import <BVSDK/BVConversationsInclude.h>
+#import <BVSDK/BVErrorCode.h>
 #import <BVSDK/BVFilter.h>
 #import <BVSDK/BVFormField.h>
 #import <BVSDK/BVFormFieldOptions.h>
 #import <BVSDK/BVModelUtil.h>
-#import <BVSDK/BVErrorCode.h>
-#import <BVSDK/BVConversationsError.h>
 #import <BVSDK/NSError+BVErrorCodeParser.h>
 #import <BVSDK/NSError+BVSubmissionErrorCodeParser.h>
 
-#import <BVSDK/BVUploadableStorePhoto.h>
 #import <BVSDK/BVAnswer.h>
 #import <BVSDK/BVAnswerCollectionViewCell.h>
-#import <BVSDK/BVAnswersCollectionView.h>
-#import <BVSDK/BVAnswerTableViewCell.h>
-#import <BVSDK/BVAnswersTableView.h>
-#import <BVSDK/BVAnswerSubmissionErrorResponse.h>
-#import <BVSDK/BVAnswerView.h>
 #import <BVSDK/BVAnswerSubmission.h>
+#import <BVSDK/BVAnswerSubmissionErrorResponse.h>
 #import <BVSDK/BVAnswerSubmissionResponse.h>
+#import <BVSDK/BVAnswerTableViewCell.h>
+#import <BVSDK/BVAnswerView.h>
+#import <BVSDK/BVAnswersCollectionView.h>
+#import <BVSDK/BVAnswersTableView.h>
 #import <BVSDK/BVConversationsRequest.h>
+#import <BVSDK/BVUploadableStorePhoto.h>
 
 #import <BVSDK/BVBulkRatingsFilterType.h>
 #import <BVSDK/BVBulkRatingsRequest.h>
 #import <BVSDK/BVBulkStoreItemsRequest.h>
 #import <BVSDK/BVProductDisplayPageRequest.h>
 #import <BVSDK/BVProductPageViews.h>
 #import <BVSDK/BVQuestionCollectionViewCell.h>
-#import <BVSDK/BVQuestionsTableView.h>
-#import <BVSDK/BVReviewCollectionViewCell.h>
-#import <BVSDK/BVUploadablePhoto.h>
-#import <BVSDK/BVProductDisplayPageRequest.h>
-#import <BVSDK/BVQuestionsAndAnswersRequest.h>
-#import <BVSDK/BVQuestionTableViewCell.h>
+#import <BVSDK/BVQuestionSubmission.h>
 #import <BVSDK/BVQuestionSubmissionErrorResponse.h>
+#import <BVSDK/BVQuestionTableViewCell.h>
 #import <BVSDK/BVQuestionView.h>
+#import <BVSDK/BVQuestionsAndAnswersRequest.h>
 #import <BVSDK/BVQuestionsCollectionView.h>
-#import <BVSDK/BVQuestionView.h>
+#import <BVSDK/BVQuestionsTableView.h>
+#import <BVSDK/BVReviewCollectionViewCell.h>
 #import <BVSDK/BVStoreReviewsRequest.h>
-#import <BVSDK/BVQuestionSubmission.h>
+#import <BVSDK/BVUploadablePhoto.h>
 
-#import <BVSDK/BVAuthorRequest.h>
 #import <BVSDK/BVAuthorInclude.h>
-#import <BVSDK/BVBaseReviewsRequest.h>
+#import <BVSDK/BVAuthorRequest.h>
 #import <BVSDK/BVBaseProductRequest.h>
-#import <BVSDK/BVProductTextSearchRequest.h>
+#import <BVSDK/BVBaseReviewsRequest.h>
 #import <BVSDK/BVBulkProductRequest.h>
-#import <BVSDK/BVReviewsRequest.h>
+#import <BVSDK/BVProductTextSearchRequest.h>
+#import <BVSDK/BVReviewSubmissionErrorResponse.h>
 #import <BVSDK/BVReviewTableViewCell.h>
 #import <BVSDK/BVReviewView.h>
 #import <BVSDK/BVReviewsCollectionView.h>
+#import <BVSDK/BVReviewsRequest.h>
 #import <BVSDK/BVReviewsTableView.h>
-#import <BVSDK/BVReviewSubmissionErrorResponse.h>
 
 #import <BVSDK/BVFeedbackSubmission.h>
 #import <BVSDK/BVFeedbackSubmissionResponse.h>
 
 #import <BVSDK/BVStoreReviewSubmission.h>
 #import <BVSDK/BVStoreReviewsTableView.h>
 
-#import <BVSDK/BVCommentsRequest.h>
-#import <BVSDK/BVCommentsResponse.h>
 #import <BVSDK/BVCommentSubmission.h>
+#import <BVSDK/BVCommentSubmissionErrorResponse.h>
 #import <BVSDK/BVCommentSubmissionResponse.h>
+#import <BVSDK/BVCommentsRequest.h>
+#import <BVSDK/BVCommentsResponse.h>
 #import <BVSDK/BVSubmittedComment.h>
-#import <BVSDK/BVCommentSubmissionErrorResponse.h>
 
 // Conversations Auth
+#import <BVSDK/BVSubmittedUAS.h>
 #import <BVSDK/BVUASSubmission.h>
 #import <BVSDK/BVUASSubmissionErrorResponse.h>
 #import <BVSDK/BVUASSubmissionResponse.h>
-#import <BVSDK/BVSubmittedUAS.h>
 
 // Curations
 #import <BVSDK/BVCurations.h>
-#import <BVSDK/BVCurationsFeedRequest.h>
+#import <BVSDK/BVCurationsAddPostRequest.h>
 #import <BVSDK/BVCurationsFeedItem.h>
 #import <BVSDK/BVCurationsFeedLoader.h>
-#import <BVSDK/BVCurationsAddPostRequest.h>
-
 #import <BVSDK/BVCurationsFeedRequest.h>
-#import <BVSDK/BVCurationsFeedItem.h>
+
 #import <BVSDK/BVCurationsAddPostRequest.h>
+#import <BVSDK/BVCurationsFeedItem.h>
+#import <BVSDK/BVCurationsFeedRequest.h>
 
 #import <BVSDK/BVCurationsFeedLoader.h>
 #import <BVSDK/BVCurationsPhotoUploader.h>
 
 // CurationsUI
-#import <BVSDK/BVCurationsUICollectionView.h>
 #import <BVSDK/BVCurationsPostViewController.h>
+#import <BVSDK/BVCurationsUICollectionView.h>
 #import <BVSDK/BVCurationsUICollectionViewCell.h>
 
 // Location
-#import <BVSDK/BVPlaceAttributes.h>
 #import <BVSDK/BVLocation.h>
 #import <BVSDK/BVLocationAnalyticsHelper.h>
 #import <BVSDK/BVLocationManager.h>
 #import <BVSDK/BVLocationWrapper.h>
+#import <BVSDK/BVPlaceAttributes.h>
 
 // Recommendations
-#import <BVSDK/BVRecommendations.h>
-#import <BVSDK/BVRecsAnalyticsHelper.h>
 #import <BVSDK/BVProductRecommendationView.h>
 #import <BVSDK/BVProductRecommendationsContainer.h>
-#import <BVSDK/BVShopperProfileRequestCache.h>
 #import <BVSDK/BVProductReview.h>
+#import <BVSDK/BVRecommendations.h>
+#import <BVSDK/BVRecsAnalyticsHelper.h>
+#import <BVSDK/BVShopperProfileRequestCache.h>
 
 // Post Interaction Notifications
 #import <BVSDK/BVPIN.h>

diff --git a/BVSDKTests/UIImage+BundleLocator.h b/BVSDKTests/UIImage+BundleLocator.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 @interface UIImage (BundleLocator)
-+(UIImage*)bundledImageNamed:(NSString*) imageName;
++ (UIImage *)bundledImageNamed:(NSString *)imageName;
 @end
 
 @interface BundleLocator : NSObject

diff --git a/BVSDKTests/UIImage+BundleLocator.m b/BVSDKTests/UIImage+BundleLocator.m
@@ -8,12 +8,12 @@
 #import "UIImage+BundleLocator.h"
 
 @implementation UIImage (BundleLocator)
-+(UIImage*)bundledImageNamed:(NSString*) imageName
-{
-    
-    return [UIImage imageNamed:imageName
-                      inBundle:[NSBundle bundleForClass:[BundleLocator class]]
-                       compatibleWithTraitCollection:nil];
++ (UIImage *)bundledImageNamed:(NSString *)imageName {
+
+  return [UIImage imageNamed:imageName
+                           inBundle:[NSBundle
+                                        bundleForClass:[BundleLocator class]]
+      compatibleWithTraitCollection:nil];
 }
 @end
 

diff --git a/Examples/Advertising/Obj-C/TargetedAdsDemo/AppDelegate.h b/Examples/Advertising/Obj-C/TargetedAdsDemo/AppDelegate.h
@@ -9,7 +9,6 @@
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
-@property (strong, nonatomic) UIWindow *window;
+@property(strong, nonatomic) UIWindow *window;
 
 @end
-