commit 1eaa9a41f0aa1c3ef9d61a3269ac2a00eeae2f0a
author Martin Haimberger <martin.haimberger@gmail.com> Fri Nov 28 23:21:06 2025 +0100
committer Jens Geyer <Jens-G@users.noreply.github.com> Wed Dec 10 22:57:59 2025 +0100
tree 2f63f5bdd234136dd14cf0be70588eccd07995e1
parent dee782f410c5d20ceb745d2b840ce447f6d4b7b1

- THRIFT-5712 - Added Dart 3 Compatibility

test/dart/test_client/bin/main.dart

diff --git a/test/dart/test_client/bin/main.dart b/test/dart/test_client/bin/main.dart
index feba612..c06c09e 100644
--- a/test/dart/test_client/bin/main.dart
+++ b/test/dart/test_client/bin/main.dart
@@ -21,10 +21,10 @@
 
 import 'package:args/args.dart';
 import 'package:collection/collection.dart';
-import 'package:http/http.dart' as http;
 import 'package:thrift/thrift.dart';
 import 'package:thrift/thrift_console.dart';
 import 'package:thrift_test/thrift_test.dart';
+import 'package:http/io_client.dart';
 
 const TEST_BASETYPES = 1; // 0000 0001
 const TEST_STRUCTS = 2; // 0000 0010
@@ -53,13 +53,13 @@
   String toString() => '$actual != $expected';
 }
 
-List<TTest> _tests;
-ThriftTestClient client;
-bool verbose;
+late List<TTest> _tests;
+late ThriftTestClient client;
+late bool verbose;
 
 /// Adapted from TestClient.php
 main(List<String> args) async {
-  ArgResults results = _parseArgs(args);
+  ArgResults? results = _parseArgs(args);
 
   if (results == null) {
     exit(TEST_UNKNOWN);
@@ -99,7 +99,7 @@
   exit(result);
 }
 
-ArgResults _parseArgs(List<String> args) {
+ArgResults? _parseArgs(List<String> args) {
   var parser = new ArgParser();
   parser.addOption('host', defaultsTo: 'localhost', help: 'The server host');
   parser.addOption('port', defaultsTo: '9090', help: 'The port to connect to');
@@ -122,7 +122,7 @@
       });
   parser.addFlag('verbose', defaultsTo: true);
 
-  ArgResults results;
+  ArgResults? results;
   try {
     results = parser.parse(args);
   } catch (e) {
@@ -147,12 +147,12 @@
 }
 
 Future _initTestClient(
-    {String host, int port, String transportType, String protocolType}) async {
+    {required String host, required int port, required String transportType, required String protocolType}) async {
   TTransport transport;
   var protocolFactory = getProtocolFactory(protocolType);
 
   if (transportType == 'http') {
-    var httpClient = new http.IOClient();
+    var httpClient = IOClient();
     var uri = Uri.parse('http://$host:$port');
     var config = new THttpConfig(uri, {});
     transport = new THttpClientTransport(httpClient, config);
@@ -279,8 +279,8 @@
   }));
 
   tests.add(new TTest(TEST_CONTAINERS, 'testMapMap', () async {
-    Map<int, Map<int, int>> result = await client.testMapMap(1);
-    if (result.isEmpty || result[result.keys.first].isEmpty) {
+    Map<int, Map<int, int>>? result = await client.testMapMap(1);
+    if (result != null && (result.isEmpty || (result[result.keys.first] != null && result[result.keys.first]!.isEmpty))) {
       throw new TTestError(result, 'Map<int, Map<int, int>>');
     }
   }));
@@ -290,8 +290,8 @@
     input.userMap = {Numberz.FIVE: 5000};
     input.xtructs = [xtruct];
 
-    Map<int, Map<int, Insanity>> result = await client.testInsanity(input);
-    if (result.isEmpty || result[result.keys.first].isEmpty) {
+    Map<int, Map<int, Insanity>>? result = await client.testInsanity(input);
+    if (result != null &&  ( result.isEmpty || (result[result.keys.first] != null && result[result.keys.first]!.isEmpty))) {
       throw new TTestError(result, 'Map<int, Map<int, Insanity>>');
     }
   }));

test/dart/test_client/pubspec.yaml

diff --git a/test/dart/test_client/pubspec.yaml b/test/dart/test_client/pubspec.yaml
index e48da9f..3c747e5 100644
--- a/test/dart/test_client/pubspec.yaml
+++ b/test/dart/test_client/pubspec.yaml
@@ -22,11 +22,11 @@
 homepage: http://thrift.apache.org
 
 environment:
-  sdk: ">=1.24.3 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
 
 dependencies:
-  args: ">=0.13.0 <2.0.0"
-  http: ^0.13.3
+  args: "^2.4.2"
+  http: ^1.2.0
   thrift:
     path: ../../../lib/dart
   thrift_test: