Skip to content

Commit d06c140

Browse files
guykogusguykogus
committed
Clean models
1 parent 0c2de28 commit d06c140

File tree

4 files changed

+66
-165
lines changed

4 files changed

+66
-165
lines changed

‎lib/CrashReporting.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class CrashReporting {
5757
for (int i = 0; i < trace.frames.length; i++) {
5858
frames.add(ExceptionData(
5959
trace.frames[i].uri.toString(),
60-
trace.frames[i].member!,
61-
trace.frames[i].line!,
60+
trace.frames[i].member,
61+
trace.frames[i].line,
6262
trace.frames[i].column == null ? 0 : trace.frames[i].column!));
6363
}
6464
final CrashData crashData = CrashData(

‎lib/instabug_custom_http_client.dart

+48-144
Original file line numberDiff line numberDiff line change
@@ -46,193 +46,97 @@ class InstabugCustomHttpClient extends HttpClientLogger implements HttpClient {
4646

4747
@override
4848
void addCredentials(
49-
Uri url, String realm, HttpClientCredentials credentials) {
50-
client.addCredentials(url, realm, credentials);
51-
}
49+
Uri url, String realm, HttpClientCredentials credentials) =>
50+
client.addCredentials(url, realm, credentials);
5251

5352
@override
54-
void addProxyCredentials(
55-
String host, int port, String realm, HttpClientCredentials credentials) {
56-
client.addProxyCredentials(host, port, realm, credentials);
57-
}
53+
void addProxyCredentials(String host, int port, String realm,
54+
HttpClientCredentials credentials) =>
55+
client.addProxyCredentials(host, port, realm, credentials);
5856

5957
@override
6058
set authenticate(
61-
Future<bool> Function(Uri url, String scheme, String realm)? f) {
62-
client.authenticate = f;
63-
}
59+
Future<bool> Function(Uri url, String scheme, String realm)? f) =>
60+
client.authenticate = f;
6461

6562
@override
6663
set authenticateProxy(
67-
Future<bool> Function(String host, int port, String scheme, String realm)?
68-
f) {
69-
client.authenticateProxy = f;
70-
}
64+
Future<bool> Function(
65+
String host, int port, String scheme, String realm)?
66+
f) =>
67+
client.authenticateProxy = f;
7168

7269
@override
7370
set badCertificateCallback(
74-
bool Function(X509Certificate cert, String host, int port)? callback) {
75-
client.badCertificateCallback = callback;
76-
}
71+
bool Function(X509Certificate cert, String host, int port)?
72+
callback) =>
73+
client.badCertificateCallback = callback;
7774

7875
@override
79-
void close({bool force = false}) {
80-
client.close(force: force);
81-
}
76+
void close({bool force = false}) => client.close(force: force);
8277

8378
@override
84-
Future<HttpClientRequest> delete(String host, int port, String path) {
85-
return client
86-
.delete(host, port, path)
87-
.then((HttpClientRequest request) async {
88-
logger.onRequest(request);
89-
final HttpClientResponse response = await request.close();
90-
logger.onResponse(response, request);
91-
return request;
92-
});
93-
}
79+
Future<HttpClientRequest> delete(String host, int port, String path) =>
80+
client.delete(host, port, path).then(_finish);
9481

9582
@override
96-
Future<HttpClientRequest> deleteUrl(Uri url) {
97-
return client.deleteUrl(url).then((HttpClientRequest request) async {
98-
logger.onRequest(request);
99-
final HttpClientResponse response = await request.close();
100-
logger.onResponse(response, request);
101-
return request;
102-
});
103-
}
83+
Future<HttpClientRequest> deleteUrl(Uri url) =>
84+
client.deleteUrl(url).then(_finish);
10485

10586
@override
106-
set findProxy(String Function(Uri url)? f) {
107-
client.findProxy = f;
108-
}
87+
set findProxy(String Function(Uri url)? f) => client.findProxy = f;
10988

11089
@override
111-
Future<HttpClientRequest> get(String host, int port, String path) {
112-
return client.get(host, port, path).then((HttpClientRequest request) async {
113-
logger.onRequest(request);
114-
final HttpClientResponse response = await request.close();
115-
logger.onResponse(response, request);
116-
return request;
117-
});
118-
}
90+
Future<HttpClientRequest> get(String host, int port, String path) =>
91+
client.get(host, port, path).then(_finish);
11992

12093
@override
121-
Future<HttpClientRequest> getUrl(Uri url) {
122-
return client.getUrl(url).then((HttpClientRequest request) async {
123-
logger.onRequest(request);
124-
final HttpClientResponse response = await request.close();
125-
logger.onResponse(response, request);
126-
return request;
127-
});
128-
}
94+
Future<HttpClientRequest> getUrl(Uri url) => client.getUrl(url).then(_finish);
12995

13096
@override
131-
Future<HttpClientRequest> head(String host, int port, String path) {
132-
return client
133-
.head(host, port, path)
134-
.then((HttpClientRequest request) async {
135-
logger.onRequest(request);
136-
final HttpClientResponse response = await request.close();
137-
logger.onResponse(response, request);
138-
return request;
139-
});
140-
}
97+
Future<HttpClientRequest> head(String host, int port, String path) =>
98+
client.head(host, port, path).then(_finish);
14199

142100
@override
143-
Future<HttpClientRequest> headUrl(Uri url) {
144-
return client.headUrl(url).then((HttpClientRequest request) async {
145-
logger.onRequest(request);
146-
final HttpClientResponse response = await request.close();
147-
logger.onResponse(response, request);
148-
return request;
149-
});
150-
}
101+
Future<HttpClientRequest> headUrl(Uri url) =>
102+
client.headUrl(url).then(_finish);
151103

152104
@override
153105
Future<HttpClientRequest> open(
154-
String method, String host, int port, String path) {
155-
return client
156-
.open(method, host, port, path)
157-
.then((HttpClientRequest request) async {
158-
logger.onRequest(request);
159-
final HttpClientResponse response = await request.close();
160-
logger.onResponse(response, request);
161-
return request;
162-
});
163-
}
106+
String method, String host, int port, String path) =>
107+
client.open(method, host, port, path).then(_finish);
164108

165109
@override
166-
Future<HttpClientRequest> openUrl(String method, Uri url) {
167-
return client.openUrl(method, url).then((HttpClientRequest request) async {
168-
logger.onRequest(request);
169-
final HttpClientResponse response = await request.close();
170-
logger.onResponse(response, request);
171-
return request;
172-
});
173-
}
110+
Future<HttpClientRequest> openUrl(String method, Uri url) =>
111+
client.openUrl(method, url).then(_finish);
174112

175113
@override
176-
Future<HttpClientRequest> patch(String host, int port, String path) {
177-
return client
178-
.patch(host, port, path)
179-
.then((HttpClientRequest request) async {
180-
logger.onRequest(request);
181-
final HttpClientResponse response = await request.close();
182-
logger.onResponse(response, request);
183-
return request;
184-
});
185-
}
114+
Future<HttpClientRequest> patch(String host, int port, String path) =>
115+
client.patch(host, port, path).then(_finish);
186116

187117
@override
188-
Future<HttpClientRequest> patchUrl(Uri url) {
189-
return client.patchUrl(url).then((HttpClientRequest request) async {
190-
logger.onRequest(request);
191-
final HttpClientResponse response = await request.close();
192-
logger.onResponse(response, request);
193-
return request;
194-
});
195-
}
118+
Future<HttpClientRequest> patchUrl(Uri url) =>
119+
client.patchUrl(url).then(_finish);
196120

197121
@override
198-
Future<HttpClientRequest> post(String host, int port, String path) {
199-
return client
200-
.post(host, port, path)
201-
.then((HttpClientRequest request) async {
202-
logger.onRequest(request);
203-
final HttpClientResponse response = await request.close();
204-
logger.onResponse(response, request);
205-
return request;
206-
});
207-
}
122+
Future<HttpClientRequest> post(String host, int port, String path) =>
123+
client.post(host, port, path).then(_finish);
208124

209125
@override
210-
Future<HttpClientRequest> postUrl(Uri url) {
211-
return client.postUrl(url).then((HttpClientRequest request) async {
212-
logger.onRequest(request);
213-
final HttpClientResponse response = await request.close();
214-
logger.onResponse(response, request);
215-
return request;
216-
});
217-
}
126+
Future<HttpClientRequest> postUrl(Uri url) =>
127+
client.postUrl(url).then(_finish);
218128

219129
@override
220-
Future<HttpClientRequest> put(String host, int port, String path) {
221-
return client.put(host, port, path).then((HttpClientRequest request) async {
222-
logger.onRequest(request);
223-
final HttpClientResponse response = await request.close();
224-
logger.onResponse(response, request);
225-
return request;
226-
});
227-
}
130+
Future<HttpClientRequest> put(String host, int port, String path) =>
131+
client.put(host, port, path).then(_finish);
228132

229133
@override
230-
Future<HttpClientRequest> putUrl(Uri url) {
231-
return client.putUrl(url).then((HttpClientRequest request) async {
232-
logger.onRequest(request);
233-
final HttpClientResponse response = await request.close();
234-
logger.onResponse(response, request);
235-
return request;
236-
});
134+
Future<HttpClientRequest> putUrl(Uri url) => client.putUrl(url).then(_finish);
135+
136+
Future<HttpClientRequest> _finish(HttpClientRequest request) async {
137+
logger.onRequest(request);
138+
final response = await request.close();
139+
logger.onResponse(response, request);
140+
return request;
237141
}
238142
}

‎lib/models/exception_data.dart

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1-
21
class ExceptionData {
2+
const ExceptionData(this.file, this.methodName, this.lineNumber, this.column);
33

4-
ExceptionData(this.file, this.methodName, this.lineNumber, this.column);
5-
6-
String file;
7-
String methodName;
8-
int lineNumber;
9-
int column;
4+
final String file;
5+
final String? methodName;
6+
final int? lineNumber;
7+
final int column;
108

11-
Map<String, dynamic> toJson() =>
12-
<String, dynamic> {
13-
'file': file,
14-
'methodName': methodName,
15-
'arguments': <dynamic>[],
16-
'lineNumber': lineNumber,
17-
'column': column,
18-
};
9+
Map<String, dynamic> toJson() => <String, dynamic>{
10+
'file': file,
11+
'methodName': methodName,
12+
'arguments': <dynamic>[],
13+
'lineNumber': lineNumber,
14+
'column': column,
15+
};
1916

2017
Map<String, dynamic> toMap() {
2118
final Map<String, dynamic> map = <String, dynamic>{};
2219
map['file'] = file;
23-
map['methodName'] = methodName;
20+
map['methodName'] = methodName;
2421
map['arguments'] = <dynamic>[];
2522
map['lineNumber'] = lineNumber;
2623
map['column'] = column;
2724
return map;
2825
}
29-
}
26+
}

‎test/instabug_flutter_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@ void main() {
718718
for (int i = 0; i < trace.frames.length; i++) {
719719
frames.add(ExceptionData(
720720
trace.frames[i].uri.toString(),
721-
trace.frames[i].member!,
722-
trace.frames[i].line!,
721+
trace.frames[i].member,
722+
trace.frames[i].line,
723723
trace.frames[i].column == null ? 0 : trace.frames[i].column!));
724724
}
725725
final crashData = CrashData(

0 commit comments

Comments
 (0)