Simplified Constructor in FBAgentLaunchConfiguration

Summary: About to change the constructor, so to make it easier moving to the same internal and external constructor. The static constructor is confusing as it is niil-returning (even though not declaring this) and takes no error out.

Reviewed By: c-ryan747

Differential Revision: D26688006

fbshipit-source-id: d23bdbdd76ccb7b439dd151ef3d756ecf32c9172

FBControlCore/Configuration/FBAgentLaunchConfiguration.h

@@ -26,7 +26,7 @@ typedef NS_ENUM(NSUInteger, FBAgentLaunchMode) {
 @interface FBAgentLaunchConfiguration : FBProcessLaunchConfiguration
 
 /**
- Creates and returns a new Configuration with the provided parameters
+ The designated initializer.
 
  @param launchPath the path to the executable to launch.
  @param arguments an array-of-strings of arguments to the process. Must not be nil.
@@ -35,7 +35,7 @@ typedef NS_ENUM(NSUInteger, FBAgentLaunchMode) {
  @param mode the launch mode to use.
  @return a new Configuration Object with the arguments applied.
  */
-+ (instancetype)configurationWithLaunchPath:(NSString *)launchPath arguments:(NSArray<NSString *> *)arguments environment:(NSDictionary<NSString *, NSString *> *)environment output:(FBProcessOutputConfiguration *)output mode:(FBAgentLaunchMode)mode;
+- (instancetype)initWithLaunchPath:(NSString *)launchPath arguments:(NSArray<NSString *> *)arguments environment:(NSDictionary<NSString *, NSString *> *)environment output:(FBProcessOutputConfiguration *)output mode:(FBAgentLaunchMode)mode;
 
 /**
  The Binary Path of the agent to Launch.

FBControlCore/Configuration/FBAgentLaunchConfiguration.m

@@ -12,13 +12,6 @@
 
 @implementation FBAgentLaunchConfiguration
 
-+ (instancetype)configurationWithLaunchPath:(NSString *)launchPath arguments:(NSArray<NSString *> *)arguments environment:(NSDictionary<NSString *, NSString *> *)environment output:(FBProcessOutputConfiguration *)output mode:(FBAgentLaunchMode)mode
-{
-  if (!launchPath || !arguments || !environment) {
-    return nil;
-  }
-  return [[self alloc] initWithLaunchPath:launchPath arguments:arguments environment:environment output:output mode:mode];
-}
 - (instancetype)initWithLaunchPath:(NSString *)launchPath arguments:(NSArray<NSString *> *)arguments environment:(NSDictionary<NSString *, NSString *> *)environment output:(FBProcessOutputConfiguration *)output mode:(FBAgentLaunchMode)mode
 {
   self = [super initWithArguments:arguments environment:environment output:output];

FBSimulatorControl/Commands/FBSimulatorLaunchCtlCommands.m

@@ -243,8 +243,8 @@ + (NSString *)extractServiceNameFromListLine:(NSString *)line processIdentifierO
 - (FBFuture<NSString *> *)runWithArguments:(NSArray<NSString *> *)arguments
 {
   // Construct a Launch Configuration for launchctl we'll use the 'list' command.
-  FBAgentLaunchConfiguration *launchConfiguration = [FBAgentLaunchConfiguration
-    configurationWithLaunchPath:self.launchctlLaunchPath
+  FBAgentLaunchConfiguration *launchConfiguration = [[FBAgentLaunchConfiguration alloc]
+    initWithLaunchPath:self.launchctlLaunchPath
     arguments:arguments
     environment:@{}
     output:FBProcessOutputConfiguration.outputToDevNull

FBSimulatorControl/Commands/FBSimulatorLogCommands.m

@@ -70,8 +70,8 @@ - (instancetype)initWithSimulator:(FBSimulator *)simulator
     return [FBSimulatorError failFutureWithError:error];
   }
 
-  FBAgentLaunchConfiguration *configuration = [FBAgentLaunchConfiguration
-    configurationWithLaunchPath:launchPath
+  FBAgentLaunchConfiguration *configuration = [[FBAgentLaunchConfiguration alloc]
+    initWithLaunchPath:launchPath
     arguments:arguments
     environment:@{}
     output:output

FBSimulatorControl/Management/FBSimulatorBridge.m

@@ -125,8 +125,8 @@ + (NSString *)portNameForSimulator:(FBSimulator *)simulator
     return [FBFuture futureWithError:error];
   }
 
-  FBAgentLaunchConfiguration *config = [FBAgentLaunchConfiguration
-    configurationWithLaunchPath:bridgeLaunchPath
+  FBAgentLaunchConfiguration *config = [[FBAgentLaunchConfiguration alloc]
+    initWithLaunchPath:bridgeLaunchPath
     arguments:@[portName]
     environment:@{}
     output:output

FBSimulatorControl/Strategies/FBDefaultsModificationStrategy.m

@@ -102,8 +102,8 @@ - (NSString *)defaultsBinary
 - (FBFuture<NSString *> *)performDefaultsCommandWithArguments:(NSArray<NSString *> *)arguments
 {
   // Make the Launch Config
-  FBAgentLaunchConfiguration *configuration = [FBAgentLaunchConfiguration
-    configurationWithLaunchPath:self.defaultsBinary
+  FBAgentLaunchConfiguration *configuration = [[FBAgentLaunchConfiguration alloc]
+    initWithLaunchPath:self.defaultsBinary
     arguments:arguments
     environment:@{}
     output:FBProcessOutputConfiguration.outputToDevNull

FBSimulatorControl/Strategies/FBSimulatorXCTestProcessExecutor.m

@@ -55,8 +55,8 @@ - (instancetype)initWithSimulator:(FBSimulator *)simulator shims:(FBXCTestShimCo
     return [FBFuture futureWithError:error];
   }
 
-  FBAgentLaunchConfiguration *configuration = [FBAgentLaunchConfiguration
-   configurationWithLaunchPath:launchPath
+  FBAgentLaunchConfiguration *configuration = [[FBAgentLaunchConfiguration alloc]
+   initWithLaunchPath:launchPath
    arguments:arguments
    environment:environment
    output:output

FBSimulatorControlTests/Fixtures/FBSimulatorControlFixtures.m

@@ -139,8 +139,8 @@ - (FBApplicationLaunchConfiguration *)safariAppLaunchWithMode:(FBApplicationLaun
 
 - (FBAgentLaunchConfiguration *)agentLaunch1
 {
-  return [FBAgentLaunchConfiguration
-    configurationWithLaunchPath:[FBBinaryDescriptor binaryWithPath:NSProcessInfo.processInfo.arguments[0] error:nil].path
+  return [[FBAgentLaunchConfiguration alloc]
+    initWithLaunchPath:[FBBinaryDescriptor binaryWithPath:NSProcessInfo.processInfo.arguments[0] error:nil].path
     arguments:@[@"BINGBONG"]
     environment:@{@"FIB" : @"BLE"}
     output:FBProcessOutputConfiguration.outputToDevNull