From 40d8e5b20b2059bb90e7a052f322edd38330d90d Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 15 Jul 2019 10:40:02 -0700 Subject: [PATCH 1/2] More optional parameters --- dwds/lib/dwds.dart | 15 ++++++++++----- dwds/test/fixtures/context.dart | 3 --- dwds/test/fixtures/server.dart | 8 +------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dwds/lib/dwds.dart b/dwds/lib/dwds.dart index 7e1d63dd3..e8ad95bdd 100644 --- a/dwds/lib/dwds.dart +++ b/dwds/lib/dwds.dart @@ -46,17 +46,22 @@ class Dwds { } static Future start({ - @required String hostname, @required int applicationPort, @required int assetServerPort, @required String applicationTarget, - @required ReloadConfiguration reloadConfiguration, @required Stream buildResults, @required ConnectionProvider chromeConnection, - @required bool serveDevTools, - @required LogWriter logWriter, - @required bool verbose, + @optional String hostname, + @optional ReloadConfiguration reloadConfiguration, + @optional bool serveDevTools, + @optional LogWriter logWriter, + @optional bool verbose, }) async { + reloadConfiguration ??= ReloadConfiguration.none; + hostname ??= 'localhost'; + serveDevTools ??= false; + logWriter ??= (level, message) => print(message); + verbose ??= false; var assetHandler = AssetHandler( assetServerPort, applicationTarget, diff --git a/dwds/test/fixtures/context.dart b/dwds/test/fixtures/context.dart index 1db79a5f3..21761cfb3 100644 --- a/dwds/test/fixtures/context.dart +++ b/dwds/test/fixtures/context.dart @@ -84,12 +84,9 @@ class TestContext { var connection = ChromeConnection('localhost', debugPort); testServer = await TestServer.start( - 'localhost', port, daemonPort(workingDirectory), pathToServe, - ReloadConfiguration.none, - false, daemonClient.buildResults, () async => connection, ); diff --git a/dwds/test/fixtures/server.dart b/dwds/test/fixtures/server.dart index 64e2162bf..2e35df2c3 100644 --- a/dwds/test/fixtures/server.dart +++ b/dwds/test/fixtures/server.dart @@ -41,12 +41,9 @@ class TestServer { } static Future start( - String hostname, int port, int assetServerPort, String target, - ReloadConfiguration reload, - bool startDevTools, Stream buildResults, Future Function() chromeConnection, ) async { @@ -56,19 +53,16 @@ class TestServer { results.results.firstWhere((result) => result.target == target)); var dwds = await Dwds.start( - hostname: hostname, applicationPort: port, applicationTarget: target, assetServerPort: assetServerPort, buildResults: filteredBuildResults, chromeConnection: chromeConnection, logWriter: (level, message) => printOnFailure(message), - reloadConfiguration: reload, - serveDevTools: startDevTools, verbose: true, ); - var server = await HttpMultiServer.bind(hostname, port); + var server = await HttpMultiServer.bind('localhost', port); shelf_io.serveRequests(server, pipeline.addHandler(dwds.handler)); return TestServer._( target, From eea2da5f5ae19014bd184b511232ff4a8a76ec50 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 15 Jul 2019 10:45:55 -0700 Subject: [PATCH 2/2] remove silly optional parameter --- dwds/lib/dwds.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dwds/lib/dwds.dart b/dwds/lib/dwds.dart index e437a1488..f76b640a6 100644 --- a/dwds/lib/dwds.dart +++ b/dwds/lib/dwds.dart @@ -52,12 +52,12 @@ class Dwds { @required String applicationTarget, @required Stream buildResults, @required ConnectionProvider chromeConnection, - @optional String hostname, - @optional ReloadConfiguration reloadConfiguration, - @optional bool serveDevTools, - @optional LogWriter logWriter, - @optional bool verbose, - @optional bool enableDebugExtension, + String hostname, + ReloadConfiguration reloadConfiguration, + bool serveDevTools, + LogWriter logWriter, + bool verbose, + bool enableDebugExtension, }) async { hostname ??= 'localhost'; reloadConfiguration ??= ReloadConfiguration.none;