Revert "Rename a server api method and cleanup a TODO" (#7292)
diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart index 89d9ca6..8172cf5 100644 --- a/packages/devtools_app/lib/devtools.dart +++ b/packages/devtools_app/lib/devtools.dart
@@ -9,4 +9,4 @@ // the constant declaration `const String version =`. // If you change the declaration you must also modify the regex in // tools/update_version.dart. -const String version = '2.34.0-dev.0'; +const String version = '2.33.1';
diff --git a/packages/devtools_app/lib/src/shared/server/server.dart b/packages/devtools_app/lib/src/shared/server/server.dart index 96010ba..daea9b9 100644 --- a/packages/devtools_app/lib/src/shared/server/server.dart +++ b/packages/devtools_app/lib/src/shared/server/server.dart
@@ -37,7 +37,6 @@ Response? response; try { - _log.fine('requesting $url'); response = await post(Uri.parse(url)); } catch (_) {}
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index 18b6690..8bf69f9 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml
@@ -4,7 +4,7 @@ # Note: this version should only be updated by running tools/update_version.dart # that updates all versions of devtools packages (devtools_app, devtools_test). -version: 2.34.0-dev.0 +version: 2.33.1 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app @@ -69,7 +69,7 @@ dev_dependencies: args: ^2.4.2 build_runner: ^2.3.3 - devtools_test: 2.34.0-dev.0 + devtools_test: 2.33.1 fake_async: ^1.3.1 flutter_driver: sdk: flutter
diff --git a/packages/devtools_shared/CHANGELOG.md b/packages/devtools_shared/CHANGELOG.md index d937383..ec1efbf 100644 --- a/packages/devtools_shared/CHANGELOG.md +++ b/packages/devtools_shared/CHANGELOG.md
@@ -1,7 +1,5 @@ -# 8.0.0 +# 7.0.1-wip * Refactor yaml extension methods. -* **Breaking change:** rename `ServerApi.getCompleted` to `ServerApi.success` and make the -`value` parameter optional. # 7.0.0 * **Breaking change:** remove the `ServerApi.setCompleted` method that was a
diff --git a/packages/devtools_shared/lib/src/server/server_api.dart b/packages/devtools_shared/lib/src/server/server_api.dart index d432bdb..0b4c1fb 100644 --- a/packages/devtools_shared/lib/src/server/server_api.dart +++ b/packages/devtools_shared/lib/src/server/server_api.dart
@@ -45,30 +45,31 @@ api ??= ServerApi(); final queryParams = request.requestedUri.queryParameters; // TODO(kenz): break this switch statement up so that it uses helper methods - // for each case. Also use [_checkRequiredParameters] helper. + // for each case. Also use [_checkRequiredParameters] and [_encodeResponse] + // helpers. switch (request.url.path) { // ----- Flutter Tool GA store. ----- case apiGetFlutterGAEnabled: // Is Analytics collection enabled? - return _encodeResponse( - FlutterUsage.doesStoreExist ? _usage!.enabled : '', - api: api, + return api.getCompleted( + json.encode(FlutterUsage.doesStoreExist ? _usage!.enabled : ''), ); case apiGetFlutterGAClientId: // Flutter Tool GA clientId - ONLY get Flutter's clientId if enabled is // true. return (FlutterUsage.doesStoreExist) - ? _encodeResponse( - _usage!.enabled ? _usage!.clientId : '', - api: api, + ? api.getCompleted( + json.encode(_usage!.enabled ? _usage!.clientId : ''), ) - : _encodeResponse('', api: api); + : api.getCompleted( + json.encode(''), + ); // ----- DevTools GA store. ----- case apiResetDevTools: _devToolsUsage.reset(); - return _encodeResponse(true, api: api); + return api.getCompleted(json.encode(true)); case apiGetDevToolsFirstRun: // Has DevTools been run first time? To bring up analytics dialog. // @@ -77,12 +78,16 @@ // been updated final isFirstRun = _devToolsUsage.isFirstRun || analytics.shouldShowMessage; - return _encodeResponse(isFirstRun, api: api); + return api.getCompleted( + json.encode(isFirstRun), + ); case apiGetDevToolsEnabled: // Is DevTools Analytics collection enabled? final isEnabled = _devToolsUsage.analyticsEnabled && analytics.telemetryEnabled; - return _encodeResponse(isEnabled, api: api); + return api.getCompleted( + json.encode(isEnabled), + ); case apiSetDevToolsEnabled: // Enable or disable DevTools analytics collection. if (queryParams.containsKey(devToolsEnabledPropertyName)) { @@ -92,12 +97,14 @@ _devToolsUsage.analyticsEnabled = analyticsEnabled; analytics.setTelemetry(analyticsEnabled); } - return _encodeResponse(_devToolsUsage.analyticsEnabled, api: api); + return api.getCompleted( + json.encode(_devToolsUsage.analyticsEnabled), + ); case apiGetConsentMessage: - return api.success(analytics.getConsentMessage); + return api.getCompleted(analytics.getConsentMessage); case apiMarkConsentMessageAsShown: analytics.clientShowedMessage(); - return _encodeResponse(true, api: api); + return api.getCompleted(json.encode(true)); // ----- DevTools survey store. ----- @@ -116,7 +123,8 @@ _devToolsUsage.activeSurvey = theSurveyName; result = true; } - return _encodeResponse(result, api: api); + + return api.getCompleted(json.encode(result)); case apiGetSurveyActionTaken: // Request setActiveSurvey has not been requested. if (_devToolsUsage.activeSurvey == null) { @@ -126,7 +134,9 @@ ); } // SurveyActionTaken has the survey been acted upon (taken or dismissed) - return _encodeResponse(_devToolsUsage.surveyActionTaken, api: api); + return api.getCompleted( + json.encode(_devToolsUsage.surveyActionTaken), + ); // TODO(terry): remove the query param logic for this request. // setSurveyActionTaken should only be called with the value of true, so // we can remove the extra complexity. @@ -144,7 +154,9 @@ _devToolsUsage.surveyActionTaken = json.decode(queryParams[surveyActionTakenPropertyName]!); } - return _encodeResponse(_devToolsUsage.surveyActionTaken, api: api); + return api.getCompleted( + json.encode(_devToolsUsage.surveyActionTaken), + ); case apiGetSurveyShownCount: // Request setActiveSurvey has not been requested. if (_devToolsUsage.activeSurvey == null) { @@ -154,7 +166,9 @@ ); } // SurveyShownCount how many times have we asked to take survey. - return _encodeResponse(_devToolsUsage.surveyShownCount, api: api); + return api.getCompleted( + json.encode(_devToolsUsage.surveyShownCount), + ); case apiIncrementSurveyShownCount: // Request setActiveSurvey has not been requested. if (_devToolsUsage.activeSurvey == null) { @@ -165,23 +179,23 @@ } // Increment the SurveyShownCount, we've asked about the survey. _devToolsUsage.incrementSurveyShownCount(); - return _encodeResponse(_devToolsUsage.surveyShownCount, api: api); + return api.getCompleted( + json.encode(_devToolsUsage.surveyShownCount), + ); // ----- Release notes api. ----- case apiGetLastReleaseNotesVersion: - return _encodeResponse( - _devToolsUsage.lastReleaseNotesVersion, - api: api, + return api.getCompleted( + json.encode(_devToolsUsage.lastReleaseNotesVersion), ); case apiSetLastReleaseNotesVersion: if (queryParams.containsKey(lastReleaseNotesVersionPropertyName)) { _devToolsUsage.lastReleaseNotesVersion = queryParams[lastReleaseNotesVersionPropertyName]!; } - return _encodeResponse( - _devToolsUsage.lastReleaseNotesVersion, - api: api, + return api.getCompleted( + json.encode(_devToolsUsage.lastReleaseNotesVersion), ); // ----- App size api. ----- @@ -193,7 +207,7 @@ if (fileJson == null) { return api.badRequest('No JSON file available at $filePath.'); } - return api.success(fileJson); + return api.getCompleted(fileJson); } return api.badRequest( 'Request for base app size file does not ' @@ -207,7 +221,7 @@ if (fileJson == null) { return api.badRequest('No JSON file available at $filePath.'); } - return api.success(fileJson); + return api.getCompleted(fileJson); } return api.badRequest( 'Request for test app size file does not ' @@ -260,9 +274,8 @@ deeplinkManager, ); case DtdApi.apiGetDtdUri: - return _encodeResponse( - {DtdApi.uriPropertyName: dtdUri}, - api: api, + return api.getCompleted( + json.encode({DtdApi.uriPropertyName: dtdUri}), ); default: return api.notImplemented(); @@ -273,7 +286,7 @@ Object? object, { required ServerApi api, }) { - return api.success(json.encode(object)); + return api.getCompleted(json.encode(object)); } static Map<String, Object?> _wrapWithLogs( @@ -322,10 +335,8 @@ /// without any need to involve the server. shelf.Response logScreenView() => notImplemented(); - /// A [shelf.Response] for API calls that succeeded. - /// - /// The response optionally contains a single String [value]. - shelf.Response success([String? value]) => shelf.Response.ok(value); + /// Return the value of the property. + shelf.Response getCompleted(String value) => shelf.Response.ok(value); /// A [shelf.Response] for API calls that encountered a request problem e.g., /// setActiveSurvey not called. @@ -532,7 +543,7 @@ if (error != null) { return api.serverError(error); } - return api.success( + return api.getCompleted( result[DeeplinkManager.kOutputJsonField]! as String, ); }
diff --git a/packages/devtools_shared/pubspec.yaml b/packages/devtools_shared/pubspec.yaml index bd1631a..1a7de1b 100644 --- a/packages/devtools_shared/pubspec.yaml +++ b/packages/devtools_shared/pubspec.yaml
@@ -1,7 +1,7 @@ name: devtools_shared description: Package of shared Dart structures between devtools_app, dds, and other tools. -version: 8.0.0 +version: 7.0.1-wip repository: https://github.com/flutter/devtools/tree/master/packages/devtools_shared
diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml index 1d1cf78..d9166d6 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml
@@ -7,7 +7,7 @@ # When publishing new versions of this package be sure to publish a new version # of package:devtools as well. package:devtools contains a compiled snapshot of # this package. -version: 2.34.0-dev.0 +version: 2.33.1 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_test @@ -19,7 +19,7 @@ async: ^2.0.0 collection: ^1.15.0 devtools_shared: ^6.0.1 - devtools_app: 2.34.0-dev.0 + devtools_app: 2.33.1 devtools_app_shared: path: ../devtools_app_shared flutter: