Eduardo Florence

Fix bugs in GetConnect

@@ -110,7 +110,7 @@ class GetConnect extends GetConnectInterface { @@ -110,7 +110,7 @@ class GetConnect extends GetConnectInterface {
110 Decoder<T> decoder, 110 Decoder<T> decoder,
111 }) { 111 }) {
112 _checkIfDisposed(); 112 _checkIfDisposed();
113 - return httpClient.get( 113 + return httpClient.get<T>(
114 url, 114 url,
115 headers: headers, 115 headers: headers,
116 contentType: contentType, 116 contentType: contentType,
@@ -149,7 +149,7 @@ class GetConnect extends GetConnectInterface { @@ -149,7 +149,7 @@ class GetConnect extends GetConnectInterface {
149 Decoder<T> decoder, 149 Decoder<T> decoder,
150 }) { 150 }) {
151 _checkIfDisposed(); 151 _checkIfDisposed();
152 - return httpClient.put( 152 + return httpClient.put<T>(
153 url, 153 url,
154 body: body, 154 body: body,
155 headers: headers, 155 headers: headers,
@@ -170,7 +170,7 @@ class GetConnect extends GetConnectInterface { @@ -170,7 +170,7 @@ class GetConnect extends GetConnectInterface {
170 Decoder<T> decoder, 170 Decoder<T> decoder,
171 }) { 171 }) {
172 _checkIfDisposed(); 172 _checkIfDisposed();
173 - return httpClient.request( 173 + return httpClient.request<T>(
174 url, 174 url,
175 method, 175 method,
176 body: body, 176 body: body,
@@ -127,13 +127,14 @@ class GetHttpClient { @@ -127,13 +127,14 @@ class GetHttpClient {
127 127
128 final uri = _createUri(url, query); 128 final uri = _createUri(url, query);
129 129
130 - return Request( 130 + return Request<T>(
131 method: method, 131 method: method,
132 url: uri, 132 url: uri,
133 headers: headers, 133 headers: headers,
134 bodyBytes: bodyStream, 134 bodyBytes: bodyStream,
135 followRedirects: followRedirects, 135 followRedirects: followRedirects,
136 maxRedirects: maxRedirects, 136 maxRedirects: maxRedirects,
  137 + decoder: decoder
137 ); 138 );
138 } 139 }
139 140
@@ -168,7 +169,7 @@ class GetHttpClient { @@ -168,7 +169,7 @@ class GetHttpClient {
168 if (HttpStatus.unauthorized == response.statusCode && 169 if (HttpStatus.unauthorized == response.statusCode &&
169 _modifier.authenticator != null && 170 _modifier.authenticator != null &&
170 requestNumber <= maxAuthRetries) { 171 requestNumber <= maxAuthRetries) {
171 - return _performRequest( 172 + return _performRequest<T>(
172 handler, 173 handler,
173 authenticate: true, 174 authenticate: true,
174 requestNumber: requestNumber + 1, 175 requestNumber: requestNumber + 1,
@@ -247,7 +248,7 @@ class GetHttpClient { @@ -247,7 +248,7 @@ class GetHttpClient {
247 @required Map<String, dynamic> query, 248 @required Map<String, dynamic> query,
248 Decoder<T> decoder, 249 Decoder<T> decoder,
249 }) { 250 }) {
250 - return _requestWithBody(url, contentType, body, method, query, decoder); 251 + return _requestWithBody<T>(url, contentType, body, method, query, decoder);
251 } 252 }
252 253
253 Future<Request<T>> _put<T>( 254 Future<Request<T>> _put<T>(
@@ -257,7 +258,7 @@ class GetHttpClient { @@ -257,7 +258,7 @@ class GetHttpClient {
257 @required Map<String, dynamic> query, 258 @required Map<String, dynamic> query,
258 Decoder<T> decoder, 259 Decoder<T> decoder,
259 }) { 260 }) {
260 - return _requestWithBody(url, contentType, body, 'put', query, decoder); 261 + return _requestWithBody<T>(url, contentType, body, 'put', query, decoder);
261 } 262 }
262 263
263 Request<T> _delete<T>( 264 Request<T> _delete<T>(
@@ -319,8 +320,8 @@ class GetHttpClient { @@ -319,8 +320,8 @@ class GetHttpClient {
319 Decoder<T> decoder, 320 Decoder<T> decoder,
320 }) async { 321 }) async {
321 try { 322 try {
322 - var response = await _performRequest(  
323 - () => _request( 323 + var response = await _performRequest<T>(
  324 + () => _request<T>(
324 url, 325 url,
325 method, 326 method,
326 contentType: contentType, 327 contentType: contentType,
@@ -353,8 +354,8 @@ class GetHttpClient { @@ -353,8 +354,8 @@ class GetHttpClient {
353 Decoder<T> decoder, 354 Decoder<T> decoder,
354 }) async { 355 }) async {
355 try { 356 try {
356 - var response = await _performRequest(  
357 - () => _put( 357 + var response = await _performRequest<T>(
  358 + () => _put<T>(
358 url, 359 url,
359 contentType: contentType, 360 contentType: contentType,
360 query: query, 361 query: query,
@@ -411,7 +412,7 @@ class GetHttpClient { @@ -411,7 +412,7 @@ class GetHttpClient {
411 Decoder<T> decoder, 412 Decoder<T> decoder,
412 }) async { 413 }) async {
413 try { 414 try {
414 - var response = await _performRequest( 415 + var response = await _performRequest<T>(
415 () async => _delete<T>(url, contentType, query, decoder), 416 () async => _delete<T>(url, contentType, query, decoder),
416 headers: headers, 417 headers: headers,
417 ); 418 );
@@ -54,7 +54,7 @@ class Request<T> { @@ -54,7 +54,7 @@ class Request<T> {
54 int maxRedirects = 4, 54 int maxRedirects = 4,
55 FormData files, 55 FormData files,
56 bool persistentConnection = true, 56 bool persistentConnection = true,
57 - final Decoder<T> decoder, 57 + Decoder<T> decoder,
58 }) { 58 }) {
59 assert(url != null); 59 assert(url != null);
60 assert(method != null); 60 assert(method != null);