Merge pull request #1092 from smartdevicelink/bugfix/issue_1090_filemanagerconfig_init_unavailable

Make SDLFileManagerConfiguration init unavailable

4 files changed, 4 insertions, 17 deletions

diff --git a/SmartDeviceLink/SDLFileManagerConfiguration.h b/SmartDeviceLink/SDLFileManagerConfiguration.h
index 869e1db3e..693a4111f 100644
--- a/SmartDeviceLink/SDLFileManagerConfiguration.h
+++ b/SmartDeviceLink/SDLFileManagerConfiguration.h
@@ -36,11 +36,9 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)defaultConfiguration;
 
 /**
- *  Creates a file manager configuration.
- *
- *  @return The configuration
+ Use `defaultConfiguration` instead
  */
-- (instancetype)init;
+- (instancetype)init NS_UNAVAILABLE;
 
 /**
  *  Creates a file manager configuration with customized upload retry counts.
diff --git a/SmartDeviceLink/SDLFileManagerConfiguration.m b/SmartDeviceLink/SDLFileManagerConfiguration.m
index 4b125feb1..781fdac1b 100644
--- a/SmartDeviceLink/SDLFileManagerConfiguration.m
+++ b/SmartDeviceLink/SDLFileManagerConfiguration.m
@@ -18,10 +18,6 @@ static NSUInteger const DefaultRetryCount = 1;
     return [[self.class alloc] initWithArtworkRetryCount:DefaultRetryCount fileRetryCount:DefaultRetryCount];
 }
 
-- (instancetype)init {
-    return [self.class defaultConfiguration];
-}
-
 - (instancetype)initWithArtworkRetryCount:(UInt8)artworkRetryCount fileRetryCount:(UInt8)fileRetryCount {
     self = [super init];
     if (!self) {
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLFileManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLFileManagerSpec.m
index 68a24e4b6..afbd93873 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLFileManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLFileManagerSpec.m
@@ -1607,7 +1607,7 @@ describe(@"SDLFileManager reupload failed files", ^{
         __block SDLFileManagerConfiguration *testFileManagerConfiguration = nil;
 
         it(@"should set the max upload attempts to 2 if the configuration properties are not set", ^{
-            testFileManagerConfiguration = [[SDLFileManagerConfiguration alloc] init];
+            testFileManagerConfiguration = [SDLFileManagerConfiguration defaultConfiguration];
             testFileManager = [[SDLFileManager alloc] initWithConnectionManager:testConnectionManager configuration:testFileManagerConfiguration];
 
             expect(testFileManager.maxFileUploadAttempts).to(equal(2));
diff --git a/SmartDeviceLinkTests/SDLFileManagerConfigurationSpec.m b/SmartDeviceLinkTests/SDLFileManagerConfigurationSpec.m
index 5b7742be2..c3d4b6abb 100644
--- a/SmartDeviceLinkTests/SDLFileManagerConfigurationSpec.m
+++ b/SmartDeviceLinkTests/SDLFileManagerConfigurationSpec.m
@@ -17,7 +17,7 @@ describe(@"A file manager configuration", ^{
     __block SDLFileManagerConfiguration *testConfig = nil;
 
     it(@"should get and set correctly", ^{
-        testConfig = [[SDLFileManagerConfiguration alloc] init];
+        testConfig = [SDLFileManagerConfiguration defaultConfiguration];
         testConfig.artworkRetryCount = 5;
         testConfig.fileRetryCount = 1;
 
@@ -25,13 +25,6 @@ describe(@"A file manager configuration", ^{
         expect(testConfig.fileRetryCount).to(equal(1));
     });
 
-    it(@"should be set to default configuration if parameters are not set", ^{
-        testConfig = [[SDLFileManagerConfiguration alloc] init];
-
-        expect(testConfig.artworkRetryCount).to(equal(1));
-        expect(testConfig.fileRetryCount).to(equal(1));
-    });
-
     it(@"should instantiate correctly with the default configuration", ^{
         testConfig = [SDLFileManagerConfiguration defaultConfiguration];