Skip to content
This repository has been archived by the owner on Dec 6, 2023. It is now read-only.

Commit

Permalink
Drop deprecated fields (#1104)
Browse files Browse the repository at this point in the history 
* Drop deprecated fields

* Clean up

* More cleanup
  • Loading branch information
@domesticmouse
domesticmouse committed Jul 14, 2023
1 parent 3e017f1 commit f2447b6
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 78 deletions.
6 changes: 0 additions & 6 deletions lib/services_cloud_run.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ class EndpointsServer {

EndpointsServer._(String? redisServerUri, Sdk sdk) {
_commonServerImpl = CommonServerImpl(
_ServerContainer(),
redisServerUri == null
? InMemoryCache()
: RedisCache(
Expand Down Expand Up @@ -136,8 +135,3 @@ class EndpointsServer {
});
}
}

class _ServerContainer implements ServerContainer {
@override
String get version => '1.0';
}
6 changes: 0 additions & 6 deletions lib/services_dev.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ class EndpointsServer {

EndpointsServer._(Sdk sdk, bool nullSafety) {
final commonServerImpl = CommonServerImpl(
_ServerContainer(),
_Cache(),
sdk,
);
Expand Down Expand Up @@ -93,11 +92,6 @@ class EndpointsServer {
}
}

class _ServerContainer implements ServerContainer {
@override
String get version => '1.0';
}

class _Cache implements ServerCache {
@override
Future<String?> get(String key) => Future<String?>.value(null);
Expand Down
2 changes: 1 addition & 1 deletion lib/src/common_server_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:shelf_router/shelf_router.dart';
import 'common_server_impl.dart' show BadRequest, CommonServerImpl;
import 'protos/dart_services.pb.dart' as proto;

export 'common_server_impl.dart' show ServerContainer, log;
export 'common_server_impl.dart' show log;

part 'common_server_api.g.dart'; // generated with 'pub run build_runner build'

Expand Down
9 changes: 0 additions & 9 deletions lib/src/common_server_impl.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:convert/convert.dart';
import 'package:crypto/crypto.dart';
import 'package:logging/logging.dart';

import '../version.dart';
import 'analysis_servers.dart';
import 'common.dart';
import 'compiler.dart';
Expand All @@ -28,12 +27,7 @@ class BadRequest implements Exception {
BadRequest(this.cause);
}

abstract class ServerContainer {
String get version;
}

class CommonServerImpl {
final ServerContainer _container;
final ServerCache _cache;
final Sdk _sdk;

Expand All @@ -45,7 +39,6 @@ class CommonServerImpl {
bool get isHealthy => _analysisServers.isHealthy;

CommonServerImpl(
this._container,
this._cache,
this._sdk,
) {
Expand Down Expand Up @@ -266,8 +259,6 @@ class CommonServerImpl {
..sdkVersion = _sdk.version
..sdkVersionFull = _sdk.versionFull
..runtimeVersion = vmVersion
..servicesVersion = servicesVersion
..appEngineVersion = _container.version
..flutterDartVersion = _sdk.version
..flutterDartVersionFull = _sdk.versionFull
..flutterVersion = _sdk.flutterVersion
Expand Down
8 changes: 8 additions & 0 deletions lib/src/protos/dart_services.pb.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1847,27 +1847,35 @@ class VersionResponse extends $pb.GeneratedMessage {
@$pb.TagNumber(3)
void clearRuntimeVersion() => clearField(3);

@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(4)
$core.String get appEngineVersion => $_getSZ(3);
@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(4)
set appEngineVersion($core.String v) {
$_setString(3, v);
}

@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(4)
$core.bool hasAppEngineVersion() => $_has(3);
@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(4)
void clearAppEngineVersion() => clearField(4);

@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(5)
$core.String get servicesVersion => $_getSZ(4);
@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(5)
set servicesVersion($core.String v) {
$_setString(4, v);
}

@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(5)
$core.bool hasServicesVersion() => $_has(4);
@$core.Deprecated('This field is deprecated.')
@$pb.TagNumber(5)
void clearServicesVersion() => clearField(5);

Expand Down
42 changes: 28 additions & 14 deletions lib/src/protos/dart_services.pbjson.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,22 @@ const VersionResponse$json = {
{'1': 'sdkVersion', '3': 1, '4': 1, '5': 9, '10': 'sdkVersion'},
{'1': 'sdkVersionFull', '3': 2, '4': 1, '5': 9, '10': 'sdkVersionFull'},
{'1': 'runtimeVersion', '3': 3, '4': 1, '5': 9, '10': 'runtimeVersion'},
{'1': 'appEngineVersion', '3': 4, '4': 1, '5': 9, '10': 'appEngineVersion'},
{'1': 'servicesVersion', '3': 5, '4': 1, '5': 9, '10': 'servicesVersion'},
{
'1': 'appEngineVersion',
'3': 4,
'4': 1,
'5': 9,
'8': {'3': true},
'10': 'appEngineVersion',
},
{
'1': 'servicesVersion',
'3': 5,
'4': 1,
'5': 9,
'8': {'3': true},
'10': 'servicesVersion',
},
{'1': 'flutterVersion', '3': 6, '4': 1, '5': 9, '10': 'flutterVersion'},
{
'1': 'flutterDartVersion',
Expand Down Expand Up @@ -674,18 +688,18 @@ const VersionResponse_PackageVersionsEntry$json = {
final $typed_data.Uint8List versionResponseDescriptor = $convert.base64Decode(
'Cg9WZXJzaW9uUmVzcG9uc2USHgoKc2RrVmVyc2lvbhgBIAEoCVIKc2RrVmVyc2lvbhImCg5zZG'
'tWZXJzaW9uRnVsbBgCIAEoCVIOc2RrVmVyc2lvbkZ1bGwSJgoOcnVudGltZVZlcnNpb24YAyAB'
'KAlSDnJ1bnRpbWVWZXJzaW9uEioKEGFwcEVuZ2luZVZlcnNpb24YBCABKAlSEGFwcEVuZ2luZV'
'ZlcnNpb24SKAoPc2VydmljZXNWZXJzaW9uGAUgASgJUg9zZXJ2aWNlc1ZlcnNpb24SJgoOZmx1'
'dHRlclZlcnNpb24YBiABKAlSDmZsdXR0ZXJWZXJzaW9uEi4KEmZsdXR0ZXJEYXJ0VmVyc2lvbh'
'gHIAEoCVISZmx1dHRlckRhcnRWZXJzaW9uEjYKFmZsdXR0ZXJEYXJ0VmVyc2lvbkZ1bGwYCCAB'
'KAlSFmZsdXR0ZXJEYXJ0VmVyc2lvbkZ1bGwSYQoPcGFja2FnZVZlcnNpb25zGAkgAygLMjcuZG'
'FydF9zZXJ2aWNlcy5hcGkuVmVyc2lvblJlc3BvbnNlLlBhY2thZ2VWZXJzaW9uc0VudHJ5Ug9w'
'YWNrYWdlVmVyc2lvbnMSQAoLcGFja2FnZUluZm8YCiADKAsyHi5kYXJ0X3NlcnZpY2VzLmFwaS'
'5QYWNrYWdlSW5mb1ILcGFja2FnZUluZm8SHgoKZXhwZXJpbWVudBgLIAMoCVIKZXhwZXJpbWVu'
'dBIqChBmbHV0dGVyRW5naW5lU2hhGAwgASgJUhBmbHV0dGVyRW5naW5lU2hhEjUKBWVycm9yGG'
'MgASgLMh8uZGFydF9zZXJ2aWNlcy5hcGkuRXJyb3JNZXNzYWdlUgVlcnJvchpCChRQYWNrYWdl'
'VmVyc2lvbnNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6Aj'
'gB');
'KAlSDnJ1bnRpbWVWZXJzaW9uEi4KEGFwcEVuZ2luZVZlcnNpb24YBCABKAlCAhgBUhBhcHBFbm'
'dpbmVWZXJzaW9uEiwKD3NlcnZpY2VzVmVyc2lvbhgFIAEoCUICGAFSD3NlcnZpY2VzVmVyc2lv'
'bhImCg5mbHV0dGVyVmVyc2lvbhgGIAEoCVIOZmx1dHRlclZlcnNpb24SLgoSZmx1dHRlckRhcn'
'RWZXJzaW9uGAcgASgJUhJmbHV0dGVyRGFydFZlcnNpb24SNgoWZmx1dHRlckRhcnRWZXJzaW9u'
'RnVsbBgIIAEoCVIWZmx1dHRlckRhcnRWZXJzaW9uRnVsbBJhCg9wYWNrYWdlVmVyc2lvbnMYCS'
'ADKAsyNy5kYXJ0X3NlcnZpY2VzLmFwaS5WZXJzaW9uUmVzcG9uc2UuUGFja2FnZVZlcnNpb25z'
'RW50cnlSD3BhY2thZ2VWZXJzaW9ucxJACgtwYWNrYWdlSW5mbxgKIAMoCzIeLmRhcnRfc2Vydm'
'ljZXMuYXBpLlBhY2thZ2VJbmZvUgtwYWNrYWdlSW5mbxIeCgpleHBlcmltZW50GAsgAygJUgpl'
'eHBlcmltZW50EioKEGZsdXR0ZXJFbmdpbmVTaGEYDCABKAlSEGZsdXR0ZXJFbmdpbmVTaGESNQ'
'oFZXJyb3IYYyABKAsyHy5kYXJ0X3NlcnZpY2VzLmFwaS5FcnJvck1lc3NhZ2VSBWVycm9yGkIK'
'FFBhY2thZ2VWZXJzaW9uc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUg'
'V2YWx1ZToCOAE=');

@$core.Deprecated('Use packageInfoDescriptor instead')
const PackageInfo$json = {
Expand Down
8 changes: 4 additions & 4 deletions protos/dart_services.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,11 @@ message VersionResponse {
// semver string, and have a space and other build details appended.
string runtimeVersion = 3;

// The App Engine version.
string appEngineVersion = 4;
// Removed.
string appEngineVersion = 4 [deprecated = true];

// The dart-services backend version.
string servicesVersion = 5;
// Removed.
string servicesVersion = 5 [deprecated = true];

// The Flutter SDK's version.
string flutterVersion = 6;
Expand Down
11 changes: 2 additions & 9 deletions test/common_server_api_protobuf_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ void defineTests() {
final sdk =
Sdk.create(Platform.environment['FLUTTER_CHANNEL'] ?? stableChannel);
setUpAll(() async {
final container = MockContainer();
final cache = MockCache();
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
commonServerApi = CommonServerApi(commonServerImpl);
await commonServerImpl.init();

Expand Down Expand Up @@ -415,9 +414,8 @@ main() {
final sdk =
Sdk.create(Platform.environment['FLUTTER_CHANNEL'] ?? stableChannel);
setUpAll(() async {
final container = MockContainer();
final cache = MockCache();
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
commonServerApi = CommonServerApi(commonServerImpl);
await commonServerImpl.init();

Expand Down Expand Up @@ -751,11 +749,6 @@ main() {
// End of multi file files={} tests group.
}

class MockContainer implements ServerContainer {
@override
String get version => vmVersion;
}

class MockCache implements ServerCache {
@override
Future<String?> get(String key) => Future.value(null);
Expand Down
11 changes: 2 additions & 9 deletions test/common_server_api_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ void defineTests() {
final sdk =
Sdk.create(Platform.environment['FLUTTER_CHANNEL'] ?? stableChannel);
setUp(() async {
final container = MockContainer();
final cache = MockCache();
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
commonServerApi = CommonServerApi(commonServerImpl);
await commonServerImpl.init();

Expand Down Expand Up @@ -539,9 +538,8 @@ main() {
final sdk =
Sdk.create(Platform.environment['FLUTTER_CHANNEL'] ?? stableChannel);
setUp(() async {
final container = MockContainer();
final cache = MockCache();
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
commonServerApi = CommonServerApi(commonServerImpl);
await commonServerImpl.init();

Expand Down Expand Up @@ -1238,11 +1236,6 @@ main() {
//-------------------------------------------------------------------------
}

class MockContainer implements ServerContainer {
@override
String get version => vmVersion;
}

class MockCache implements ServerCache {
final _cache = HashMap<String, String>();

Expand Down
13 changes: 2 additions & 11 deletions test/flutter_analysis_server_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,12 @@ class HelloWorld extends StatelessWidget {
group('CommonServerImpl flutter analyze', () {
late CommonServerImpl commonServerImpl;

_MockContainer container;
_MockCache cache;

setUp(() async {
container = _MockContainer();
cache = _MockCache();
final sdk = Sdk.create(channel);
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
await commonServerImpl.init();
});

Expand Down Expand Up @@ -303,14 +301,12 @@ class HelloWorld extends StatelessWidget {
group('CommonServerImpl flutter analyzeFiles files={}', () {
late CommonServerImpl commonServerImpl;

_MockContainer container;
_MockCache cache;

setUp(() async {
container = _MockContainer();
cache = _MockCache();
final sdk = Sdk.create(channel);
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
await commonServerImpl.init();
});

Expand All @@ -336,11 +332,6 @@ class HelloWorld extends StatelessWidget {
});
}

class _MockContainer implements ServerContainer {
@override
String get version => vmVersion;
}

class _MockCache implements ServerCache {
@override
Future<String?> get(String key) => Future<String?>.value(null);
Expand Down
10 changes: 1 addition & 9 deletions tool/fuzz_driver.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'dart:io' as io;
import 'dart:math';

import 'package:dart_services/src/analysis_server.dart' as analysis_server;
import 'package:dart_services/src/common.dart';
import 'package:dart_services/src/common_server_impl.dart';
import 'package:dart_services/src/compiler.dart' as comp;
import 'package:dart_services/src/protos/dart_services.pb.dart' as proto;
Expand All @@ -26,7 +25,6 @@ bool dumpPerf = false;
bool dumpDelta = false;

late CommonServerImpl commonServerImpl;
late MockContainer container;
late MockCache cache;
analysis_server.AnalysisServerWrapper? analysisServer;

Expand Down Expand Up @@ -121,9 +119,8 @@ Future<void> setupTools(Sdk sdk) async {

print('SdKPath: ${sdk.dartSdkPath}');

container = MockContainer();
cache = MockCache();
commonServerImpl = CommonServerImpl(container, cache, sdk);
commonServerImpl = CommonServerImpl(cache, sdk);
await commonServerImpl.init();

analysisServer =
Expand Down Expand Up @@ -383,11 +380,6 @@ String mutate(String src) {
return newStr;
}

class MockContainer implements ServerContainer {
@override
String get version => vmVersion;
}

class MockCache implements ServerCache {
@override
Future<String?> get(String key) => Future<String?>.value(null);
Expand Down

0 comments on commit f2447b6

Please sign in to comment.