Skip to content

Commit

Permalink
refactor(dynamite,dynamite_runtime,nextcloud)!: generated clients no …
Browse files Browse the repository at this point in the history 
…longer implement http.Client

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>
  • Loading branch information
@Leptopoda
Leptopoda committed Apr 12, 2024
1 parent 999ab93 commit 392e18f
Show file tree
Hide file tree
Showing 41 changed files with 641 additions and 765 deletions.
12 changes: 4 additions & 8 deletions packages/dynamite/dynamite/example/lib/petstore.openapi.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,14 @@ class $Client extends _i1.DynamiteClient {
/// Creates a new `DynamiteClient` for untagged requests.
$Client(
super.baseURL, {
super.baseHeaders,
super.httpClient,
super.cookieJar,
});

/// Creates a new [$Client] from another [client].
$Client.fromClient(_i1.DynamiteClient client)
: super(
client.baseURL,
baseHeaders: client.baseHeaders,
httpClient: client.httpClient,
cookieJar: client.cookieJar,
authentications: client.authentications,
);

Expand Down Expand Up @@ -130,7 +126,7 @@ class $Client extends _i1.DynamiteClient {
tags: tags,
limit: limit,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $findPets_Serializer();
final _rawResponse = await _i1.ResponseConverter<BuiltList<Pet>, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -185,7 +181,7 @@ class $Client extends _i1.DynamiteClient {
final _request = $addPet_Request(
newPet: newPet,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $addPet_Serializer();
final _rawResponse = await _i1.ResponseConverter<Pet, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -248,7 +244,7 @@ class $Client extends _i1.DynamiteClient {
final _request = $findPetById_Request(
id: id,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $findPetById_Serializer();
final _rawResponse = await _i1.ResponseConverter<Pet, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -310,7 +306,7 @@ class $Client extends _i1.DynamiteClient {
final _request = $deletePet_Request(
id: id,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $deletePet_Serializer();
final _rawResponse = await _i1.ResponseConverter<void, void>(_serializer).convert(_response);
Expand Down
16 changes: 1 addition & 15 deletions packages/dynamite/dynamite/lib/src/builder/client.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,12 @@ Class buildRootClient(
),
)
..optionalParameters.addAll([
Parameter(
(b) => b
..name = 'baseHeaders'
..toSuper = true
..named = true,
),
Parameter(
(b) => b
..name = 'httpClient'
..toSuper = true
..named = true,
),
Parameter(
(b) => b
..name = 'cookieJar'
..toSuper = true
..named = true,
),
if (spec.hasAnySecurity)
Parameter(
(b) => b
Expand All @@ -101,9 +89,7 @@ Class buildRootClient(
const Code('''
super(
client.baseURL,
baseHeaders: client.baseHeaders,
httpClient: client.httpClient,
cookieJar: client.cookieJar,
authentications: client.authentications,
)
'''),
Expand Down Expand Up @@ -444,7 +430,7 @@ ${allocate(returnType)}(
..body = Code.scope(
(allocate) => '''
final _request = \$${name}_Request($rawParameters);
final _response = await $client.send(_request);
final _response = await $client.httpClient.send(_request);
final _serializer = \$${name}_Serializer();
final _rawResponse = await ${allocate(responseConverterType)}(_serializer).convert(_response);
Expand Down
21 changes: 1 addition & 20 deletions packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,7 @@ String toMethodName(String operationId, String? tag) {
filtered = output.join('-');
}

final dartName = toDartName(filtered ?? operationId);

if (_reservedMethodNames.contains(dartName)) {
return '\$$dartName';
}

return dartName;
return toDartName(filtered ?? operationId);

Check warning on line 92 in packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart

View check run for this annotation

Codecov / codecov/patch

packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart#L92 

Added line #L92 was not covered by tests
}

/// Helper methods to work with strings.
Expand All @@ -121,19 +115,6 @@ extension StringUtils on String {
}
}

const _reservedMethodNames = [
'send',
'head',
'get',
'post',
'put',
'patch',
'delete',
'read',
'readBytes',
'close',
];

/// A list of dart keywords and type names that need to be escaped.
const _reservedNames = [
'abstract',
Expand Down
12 changes: 4 additions & 8 deletions packages/dynamite/dynamite_end_to_end_test/lib/authentication.openapi.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,15 @@ class $Client extends _i1.DynamiteClient {
/// Creates a new `DynamiteClient` for untagged requests.
$Client(
super.baseURL, {
super.baseHeaders,
super.httpClient,
super.cookieJar,
super.authentications,
});

/// Creates a new [$Client] from another [client].
$Client.fromClient(_i1.DynamiteClient client)
: super(
client.baseURL,
baseHeaders: client.baseHeaders,
httpClient: client.httpClient,
cookieJar: client.cookieJar,
authentications: client.authentications,
);

Expand Down Expand Up @@ -75,7 +71,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$noAuthentication_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<JsonObject, void>> noAuthentication() async {
final _request = $noAuthentication_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $noAuthentication_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -137,7 +133,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$basicAuthentication_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<JsonObject, void>> basicAuthentication() async {
final _request = $basicAuthentication_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $basicAuthentication_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -199,7 +195,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$bearerAuthentication_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<JsonObject, void>> bearerAuthentication() async {
final _request = $bearerAuthentication_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $bearerAuthentication_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -261,7 +257,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$multipleAuthentications_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<JsonObject, void>> multipleAuthentications() async {
final _request = $multipleAuthentications_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $multipleAuthentications_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down
14 changes: 5 additions & 9 deletions packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,14 @@ class $Client extends _i1.DynamiteClient {
/// Creates a new `DynamiteClient` for untagged requests.
$Client(
super.baseURL, {
super.baseHeaders,
super.httpClient,
super.cookieJar,
});

/// Creates a new [$Client] from another [client].
$Client.fromClient(_i1.DynamiteClient client)
: super(
client.baseURL,
baseHeaders: client.baseHeaders,
httpClient: client.httpClient,
cookieJar: client.cookieJar,
authentications: client.authentications,
);

Expand Down Expand Up @@ -135,7 +131,7 @@ class $Client extends _i1.DynamiteClient {
tags: tags,
limit: limit,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $findValues_Serializer();
final _rawResponse = await _i1.ResponseConverter<Object1, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -207,7 +203,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$multipleNewLines_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<Object1, void>> multipleNewLines() async {
final _request = $multipleNewLines_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $multipleNewLines_Serializer();
final _rawResponse = await _i1.ResponseConverter<Object1, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -255,7 +251,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$nonRootClientSetMode_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<Object1, void>> nonRootClientSetMode() async {
final _request = $nonRootClientSetMode_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $nonRootClientSetMode_Serializer();
final _rawResponse = await _i1.ResponseConverter<Object1, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -335,7 +331,7 @@ class $NonRootClientClient {
/// * [$multipleNewLines_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<Object1, void>> multipleNewLines() async {
final _request = $multipleNewLines_Request();
final _response = await _rootClient.send(_request);
final _response = await _rootClient.httpClient.send(_request);

final _serializer = $multipleNewLines_Serializer();
final _rawResponse = await _i1.ResponseConverter<Object1, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -383,7 +379,7 @@ class $NonRootClientClient {
/// * [$setMode_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<Object1, void>> setMode() async {
final _request = $setMode_Request();
final _response = await _rootClient.send(_request);
final _response = await _rootClient.httpClient.send(_request);

final _serializer = $setMode_Serializer();
final _rawResponse = await _i1.ResponseConverter<Object1, void>(_serializer).convert(_response);
Expand Down
10 changes: 3 additions & 7 deletions packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@ class $Client extends _i1.DynamiteClient {
/// Creates a new `DynamiteClient` for untagged requests.
$Client(
super.baseURL, {
super.baseHeaders,
super.httpClient,
super.cookieJar,
});

/// Creates a new [$Client] from another [client].
$Client.fromClient(_i1.DynamiteClient client)
: super(
client.baseURL,
baseHeaders: client.baseHeaders,
httpClient: client.httpClient,
cookieJar: client.cookieJar,
authentications: client.authentications,
);

Expand Down Expand Up @@ -76,7 +72,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$$get_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<void, GetHeaders>> $get() async {
final _request = $$get_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $$get_Serializer();
final _rawResponse = await _i1.ResponseConverter<void, GetHeaders>(_serializer).convert(_response);
Expand Down Expand Up @@ -121,7 +117,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$withContentOperationId_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<void, WithContentOperationIdHeaders>> withContentOperationId() async {
final _request = $withContentOperationId_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $withContentOperationId_Serializer();
final _rawResponse =
Expand Down Expand Up @@ -167,7 +163,7 @@ class $Client extends _i1.DynamiteClient {
/// * [$getWithContent_Serializer] for a converter to parse the `Response` from an executed request.
Future<_i1.DynamiteResponse<Uint8List, GetWithContentHeaders>> getWithContent() async {
final _request = $getWithContent_Request();
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $getWithContent_Serializer();
final _rawResponse = await _i1.ResponseConverter<Uint8List, GetWithContentHeaders>(_serializer).convert(_response);
Expand Down
12 changes: 4 additions & 8 deletions packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,14 @@ class $Client extends _i1.DynamiteClient {
/// Creates a new `DynamiteClient` for untagged requests.
$Client(
super.baseURL, {
super.baseHeaders,
super.httpClient,
super.cookieJar,
});

/// Creates a new [$Client] from another [client].
$Client.fromClient(_i1.DynamiteClient client)
: super(
client.baseURL,
baseHeaders: client.baseHeaders,
httpClient: client.httpClient,
cookieJar: client.cookieJar,
authentications: client.authentications,
);

Expand Down Expand Up @@ -220,7 +216,7 @@ class $Client extends _i1.DynamiteClient {
anyOf: anyOf,
enumPattern: enumPattern,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $$get_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -428,7 +424,7 @@ class $Client extends _i1.DynamiteClient {
anyOf: anyOf,
enumPattern: enumPattern,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $getHeaders_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -479,7 +475,7 @@ class $Client extends _i1.DynamiteClient {
final _request = $getPathParameter_Request(
pathParameter: pathParameter,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $getPathParameter_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down Expand Up @@ -566,7 +562,7 @@ class $Client extends _i1.DynamiteClient {
parameters: parameters,
headers: headers,
);
final _response = await send(_request);
final _response = await httpClient.send(_request);

final _serializer = $getNamingCollisions_Serializer();
final _rawResponse = await _i1.ResponseConverter<JsonObject, void>(_serializer).convert(_response);
Expand Down

0 comments on commit 392e18f

Please sign in to comment.