Refactor server APIs by logical groups (#6713)

flutter · Nov 13, 2023 · 2a84a61 · 2a84a61
1 parent d6e484c
commit 2a84a61
Show file tree

Hide file tree

Showing 23 changed files with 563 additions and 655 deletions.
diff --git a/packages/devtools_app/lib/src/extensions/embedded/_controller_web.dart b/packages/devtools_app/lib/src/extensions/embedded/_controller_web.dart
@@ -11,10 +11,10 @@ import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_extensions/api.dart';
 import 'package:path/path.dart' as path;
 
-import '../../shared/config_specific/server/server.dart';
 import '../../shared/development_helpers.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/utils.dart';
+import '../../shared/server/server.dart';
 import 'controller.dart';
 
 /// Incrementer for the extension iFrame view that will live for the entire

diff --git a/packages/devtools_app/lib/src/extensions/extension_service.dart b/packages/devtools_app/lib/src/extensions/extension_service.dart
@@ -6,8 +6,8 @@ import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_extensions.dart';
 import 'package:flutter/foundation.dart';
 
-import '../shared/config_specific/server/server.dart' as server;
 import '../shared/globals.dart';
+import '../shared/server/server.dart' as server;
 
 class ExtensionService extends DisposableController
     with AutoDisposeControllerMixin {

diff --git a/packages/devtools_app/lib/src/framework/release_notes/release_notes.dart b/packages/devtools_app/lib/src/framework/release_notes/release_notes.dart
@@ -10,7 +10,7 @@ import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 
 import '../../../devtools.dart' as devtools;
-import '../../shared/config_specific/server/server.dart' as server;
+import '../../shared/server/server.dart' as server;
 import '../../shared/side_panel.dart';
 
 final _log = Logger('release_notes');

diff --git a/packages/devtools_app/lib/src/framework/settings_dialog.dart b/packages/devtools_app/lib/src/framework/settings_dialog.dart
@@ -12,9 +12,9 @@ import '../shared/analytics/analytics_controller.dart';
 import '../shared/analytics/constants.dart' as gac;
 import '../shared/common_widgets.dart';
 import '../shared/config_specific/copy_to_clipboard/copy_to_clipboard.dart';
-import '../shared/config_specific/server/server.dart';
 import '../shared/globals.dart';
 import '../shared/log_storage.dart';
+import '../shared/server/server.dart';
 
 class OpenSettingsAction extends ScaffoldAction {
   OpenSettingsAction({super.key, Color? color})

diff --git a/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart b/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart
@@ -15,11 +15,11 @@ import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/charts/treemap.dart';
 import '../../shared/common_widgets.dart';
 import '../../shared/config_specific/drag_and_drop/drag_and_drop.dart';
-import '../../shared/config_specific/server/server.dart' as server;
 import '../../shared/file_import.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/screen.dart';
+import '../../shared/server/server.dart' as server;
 import '../../shared/ui/tab.dart';
 import '../../shared/utils.dart';
 import 'app_size_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart
@@ -12,7 +12,7 @@ import 'package:http/http.dart' as http;
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;
-import '../../shared/config_specific/server/server.dart' as server;
+import '../../shared/server/server.dart' as server;
 import 'deep_links_model.dart';
 
 const String _apiKey = 'AIzaSyDVE6FP3GpwxgS4q8rbS7qaf6cAbxc_elc';

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/select_project_view.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/select_project_view.dart
@@ -8,8 +8,8 @@ import 'package:flutter/material.dart';
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/common_widgets.dart';
-import '../../shared/config_specific/server/server.dart' as server;
 import '../../shared/directory_picker.dart';
+import '../../shared/server/server.dart' as server;
 import '../../shared/utils.dart';
 import 'deep_links_controller.dart';
 import 'deep_links_model.dart';

diff --git a/packages/devtools_app/lib/src/shared/analytics/_analytics_controller_web.dart b/packages/devtools_app/lib/src/shared/analytics/_analytics_controller_web.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import '../config_specific/server/server.dart' as server;
+import '../server/server.dart' as server;
 import 'analytics.dart' as ga;
 import 'analytics_controller.dart';
 

diff --git a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
@@ -15,9 +15,9 @@ import 'package:logging/logging.dart';
 import 'package:web/helpers.dart';
 
 import '../../../devtools.dart' as devtools show version;
-import '../config_specific/server/server.dart' as server;
 import '../globals.dart';
 import '../primitives/url_utils.dart';
+import '../server/server.dart' as server;
 import '../utils.dart';
 import 'analytics_common.dart';
 import 'constants.dart' as gac;

diff --git a/...ls_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_web.dart b/...ls_app/lib/src/shared/config_specific/framework_initialize/_framework_initialize_web.dart
@@ -10,7 +10,7 @@ import 'package:devtools_app_shared/utils.dart';
 import '../../../service/service_manager.dart';
 import '../../globals.dart';
 import '../../primitives/storage.dart';
-import '../../server_api_client.dart';
+import '../../server/server_api_client.dart';
 
 /// Return the url the application is launched from.
 Future<String> initializePlatform() async {

diff --git a/packages/devtools_app/lib/src/shared/config_specific/server/_server_stub.dart b/packages/devtools_app/lib/src/shared/config_specific/server/_server_stub.dart