Skip to content

Commit 723dd58

Browse files
nateboschnatebosch
authored
Fix newly enforced package:pedantic lints (flutter#20)
- prefer_conditional_assignment - prefer_single_quotes - use_function_type_syntax_for_parameters
1 parent 3b67644 commit 723dd58

File tree

5 files changed

+60
-60
lines changed

5 files changed

+60
-60
lines changed

‎example/main.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ void main() async {
77
// server.
88
var server = await HttpMultiServer.loopback(8080);
99
shelf_io.serveRequests(server, (request) {
10-
return shelf.Response.ok("Hello, world!");
10+
return shelf.Response.ok('Hello, world!');
1111
});
1212
}

‎lib/http_multi_server.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
106106
/// See [HttpServer.bind].
107107
static Future<HttpServer> loopback(int port,
108108
{int backlog, bool v6Only = false, bool shared = false}) {
109-
if (backlog == null) backlog = 0;
109+
backlog ??= 0;
110110

111111
return _loopback(
112112
port,
@@ -122,7 +122,7 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
122122
bool v6Only = false,
123123
bool requestClientCertificate = false,
124124
bool shared = false}) {
125-
if (backlog == null) backlog = 0;
125+
backlog ??= 0;
126126

127127
return _loopback(
128128
port,
@@ -161,7 +161,7 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
161161
/// [bind] should forward to either [HttpServer.bind] or
162162
/// [HttpServer.bindSecure].
163163
static Future<HttpServer> _loopback(
164-
int port, Future<HttpServer> bind(InternetAddress address, int port),
164+
int port, Future<HttpServer> Function(InternetAddress, int port) bind,
165165
[int remainingRetries]) async {
166166
remainingRetries ??= 5;
167167

‎lib/src/multi_headers.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class MultiHeaders implements HttpHeaders {
101101
}
102102

103103
@override
104-
void forEach(void f(String name, List<String> values)) =>
104+
void forEach(void Function(String name, List<String> values) f) =>
105105
_headers.first.forEach(f);
106106

107107
@override

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: http_multi_server
2-
version: 2.1.0
2+
version: 2.1.1-dev
33

44
description: >-
55
A dart:io HttpServer wrapper that handles requests from multiple servers.

‎test/http_multi_server_test.dart‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -11,127 +11,127 @@ import 'package:http_multi_server/src/utils.dart';
1111
import 'package:test/test.dart';
1212

1313
void main() {
14-
group("with multiple HttpServers", () {
14+
group('with multiple HttpServers', () {
1515
var multiServer;
1616
HttpServer subServer1;
1717
HttpServer subServer2;
1818
HttpServer subServer3;
1919
setUp(() {
2020
return Future.wait([
21-
HttpServer.bind("localhost", 0).then((server) => subServer1 = server),
22-
HttpServer.bind("localhost", 0).then((server) => subServer2 = server),
23-
HttpServer.bind("localhost", 0).then((server) => subServer3 = server)
21+
HttpServer.bind('localhost', 0).then((server) => subServer1 = server),
22+
HttpServer.bind('localhost', 0).then((server) => subServer2 = server),
23+
HttpServer.bind('localhost', 0).then((server) => subServer3 = server)
2424
]).then((servers) => multiServer = HttpMultiServer(servers));
2525
});
2626

2727
tearDown(() => multiServer.close());
2828

29-
test("listen listens to all servers", () {
29+
test('listen listens to all servers', () {
3030
multiServer.listen((request) {
31-
request.response.write("got request");
31+
request.response.write('got request');
3232
request.response.close();
3333
});
3434

35-
expect(_read(subServer1), completion(equals("got request")));
36-
expect(_read(subServer2), completion(equals("got request")));
37-
expect(_read(subServer3), completion(equals("got request")));
35+
expect(_read(subServer1), completion(equals('got request')));
36+
expect(_read(subServer2), completion(equals('got request')));
37+
expect(_read(subServer3), completion(equals('got request')));
3838
});
3939

40-
test("serverHeader= sets the value for all servers", () {
41-
multiServer.serverHeader = "http_multi_server test";
40+
test('serverHeader= sets the value for all servers', () {
41+
multiServer.serverHeader = 'http_multi_server test';
4242

4343
multiServer.listen((request) {
44-
request.response.write("got request");
44+
request.response.write('got request');
4545
request.response.close();
4646
});
4747

4848
expect(
4949
_get(subServer1).then((response) {
5050
expect(
51-
response.headers['server'], equals("http_multi_server test"));
51+
response.headers['server'], equals('http_multi_server test'));
5252
}),
5353
completes);
5454

5555
expect(
5656
_get(subServer2).then((response) {
5757
expect(
58-
response.headers['server'], equals("http_multi_server test"));
58+
response.headers['server'], equals('http_multi_server test'));
5959
}),
6060
completes);
6161

6262
expect(
6363
_get(subServer3).then((response) {
6464
expect(
65-
response.headers['server'], equals("http_multi_server test"));
65+
response.headers['server'], equals('http_multi_server test'));
6666
}),
6767
completes);
6868
});
6969

70-
test("autoCompress= sets the value for all servers", () {
70+
test('autoCompress= sets the value for all servers', () {
7171
multiServer.autoCompress = true;
7272

7373
multiServer.listen((request) {
74-
request.response.write("got request");
74+
request.response.write('got request');
7575
request.response.close();
7676
});
7777

7878
expect(
7979
_get(subServer1).then((response) {
80-
expect(response.headers['content-encoding'], equals("gzip"));
80+
expect(response.headers['content-encoding'], equals('gzip'));
8181
}),
8282
completes);
8383

8484
expect(
8585
_get(subServer2).then((response) {
86-
expect(response.headers['content-encoding'], equals("gzip"));
86+
expect(response.headers['content-encoding'], equals('gzip'));
8787
}),
8888
completes);
8989

9090
expect(
9191
_get(subServer3).then((response) {
92-
expect(response.headers['content-encoding'], equals("gzip"));
92+
expect(response.headers['content-encoding'], equals('gzip'));
9393
}),
9494
completes);
9595
});
9696

97-
test("headers.set sets the value for all servers", () {
97+
test('headers.set sets the value for all servers', () {
9898
multiServer.defaultResponseHeaders
99-
.set("server", "http_multi_server test");
99+
.set('server', 'http_multi_server test');
100100

101101
multiServer.listen((request) {
102-
request.response.write("got request");
102+
request.response.write('got request');
103103
request.response.close();
104104
});
105105

106106
expect(
107107
_get(subServer1).then((response) {
108108
expect(
109-
response.headers['server'], equals("http_multi_server test"));
109+
response.headers['server'], equals('http_multi_server test'));
110110
}),
111111
completes);
112112

113113
expect(
114114
_get(subServer2).then((response) {
115115
expect(
116-
response.headers['server'], equals("http_multi_server test"));
116+
response.headers['server'], equals('http_multi_server test'));
117117
}),
118118
completes);
119119

120120
expect(
121121
_get(subServer3).then((response) {
122122
expect(
123-
response.headers['server'], equals("http_multi_server test"));
123+
response.headers['server'], equals('http_multi_server test'));
124124
}),
125125
completes);
126126
});
127127

128-
test("connectionsInfo sums the values for all servers", () {
128+
test('connectionsInfo sums the values for all servers', () {
129129
var pendingRequests = 0;
130130
var awaitingResponseCompleter = Completer();
131131
var sendResponseCompleter = Completer();
132132
multiServer.listen((request) {
133133
sendResponseCompleter.future.then((_) {
134-
request.response.write("got request");
134+
request.response.write('got request');
135135
request.response.close();
136136
});
137137

@@ -156,83 +156,83 @@ void main() {
156156
});
157157
});
158158

159-
group("HttpMultiServer.loopback", () {
159+
group('HttpMultiServer.loopback', () {
160160
var server;
161161
setUp(() {
162162
return HttpMultiServer.loopback(0).then((s) => server = s);
163163
});
164164

165165
tearDown(() => server.close());
166166

167-
test("listens on all localhost interfaces", () async {
167+
test('listens on all localhost interfaces', () async {
168168
server.listen((request) {
169-
request.response.write("got request");
169+
request.response.write('got request');
170170
request.response.close();
171171
});
172172

173173
if (await supportsIPv4) {
174-
expect(http.read("http://127.0.0.1:${server.port}/"),
175-
completion(equals("got request")));
174+
expect(http.read('http://127.0.0.1:${server.port}/'),
175+
completion(equals('got request')));
176176
}
177177

178178
if (await supportsIPv6) {
179-
expect(http.read("http://[::1]:${server.port}/"),
180-
completion(equals("got request")));
179+
expect(http.read('http://[::1]:${server.port}/'),
180+
completion(equals('got request')));
181181
}
182182
});
183183
});
184184

185-
group("HttpMultiServer.bind", () {
185+
group('HttpMultiServer.bind', () {
186186
test("listens on all localhost interfaces for 'localhost'", () async {
187-
final server = await HttpMultiServer.bind("localhost", 0);
187+
final server = await HttpMultiServer.bind('localhost', 0);
188188
server.listen((request) {
189-
request.response.write("got request");
189+
request.response.write('got request');
190190
request.response.close();
191191
});
192192

193193
if (await supportsIPv4) {
194-
expect(http.read("http://127.0.0.1:${server.port}/"),
195-
completion(equals("got request")));
194+
expect(http.read('http://127.0.0.1:${server.port}/'),
195+
completion(equals('got request')));
196196
}
197197

198198
if (await supportsIPv6) {
199-
expect(http.read("http://[::1]:${server.port}/"),
200-
completion(equals("got request")));
199+
expect(http.read('http://[::1]:${server.port}/'),
200+
completion(equals('got request')));
201201
}
202202
});
203203

204204
test("listens on all localhost interfaces for 'any'", () async {
205-
final server = await HttpMultiServer.bind("any", 0);
205+
final server = await HttpMultiServer.bind('any', 0);
206206
server.listen((request) {
207-
request.response.write("got request");
207+
request.response.write('got request');
208208
request.response.close();
209209
});
210210

211211
if (await supportsIPv4) {
212-
expect(http.read("http://127.0.0.1:${server.port}/"),
213-
completion(equals("got request")));
212+
expect(http.read('http://127.0.0.1:${server.port}/'),
213+
completion(equals('got request')));
214214
}
215215

216216
if (await supportsIPv6) {
217-
expect(http.read("http://[::1]:${server.port}/"),
218-
completion(equals("got request")));
217+
expect(http.read('http://[::1]:${server.port}/'),
218+
completion(equals('got request')));
219219
}
220220
});
221221

222-
test("listens on specified hostname", () async {
222+
test('listens on specified hostname', () async {
223223
final server = await HttpMultiServer.bind(InternetAddress.anyIPv4, 0);
224224
server.listen((request) {
225-
request.response.write("got request");
225+
request.response.write('got request');
226226
request.response.close();
227227
});
228228

229229
if (await supportsIPv4) {
230-
expect(http.read("http://127.0.0.1:${server.port}/"),
231-
completion(equals("got request")));
230+
expect(http.read('http://127.0.0.1:${server.port}/'),
231+
completion(equals('got request')));
232232
}
233233

234234
if (await supportsIPv6) {
235-
expect(http.read("http://[::1]:${server.port}/"),
235+
expect(http.read('http://[::1]:${server.port}/'),
236236
throwsA(isA<SocketException>()));
237237
}
238238
});
@@ -247,4 +247,4 @@ Future<String> _read(HttpServer server) => http.read(_urlFor(server));
247247

248248
/// Returns the URL for the root of [server].
249249
String _urlFor(HttpServer server) =>
250-
"http://${server.address.host}:${server.port}/";
250+
'http://${server.address.host}:${server.port}/';

0 commit comments

Comments
 (0)