From f9da202093716a0397136c5d12e9dc156a965091 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Mon, 19 Jun 2023 15:09:26 -0300 Subject: [PATCH] chore: Remove unused abstractions --- .../dns_providers/cloudflare/cloudflare_api.dart | 5 +++-- .../rest_maps/dns_providers/desec/desec_api.dart | 5 +++-- .../digital_ocean_dns/digital_ocean_dns_api.dart | 5 +++-- .../api_maps/rest_maps/dns_providers/dns_provider.dart | 10 ---------- .../digital_ocean/digital_ocean_api.dart | 3 +-- .../server_providers/hetzner/hetzner_api.dart | 3 +-- .../rest_maps/server_providers/volume_provider.dart | 5 ----- lib/logic/cubit/dns_records/dns_records_cubit.dart | 2 +- lib/logic/providers/dns_providers/cloudflare.dart | 2 +- .../providers/dns_providers/digital_ocean_dns.dart | 2 +- 10 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 lib/logic/api_maps/rest_maps/dns_providers/dns_provider.dart delete mode 100644 lib/logic/api_maps/rest_maps/server_providers/volume_provider.dart diff --git a/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart index 983ab3a4..9ff01bf7 100644 --- a/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart +++ b/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart @@ -2,11 +2,12 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:selfprivacy/config/get_it_config.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider.dart'; +import 'package:selfprivacy/logic/api_maps/generic_result.dart'; +import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart'; import 'package:selfprivacy/logic/models/hive/server_domain.dart'; import 'package:selfprivacy/logic/models/json/dns_records.dart'; -class CloudflareApi extends DnsProviderApi { +class CloudflareApi extends ApiMap { CloudflareApi({ this.hasLogger = false, this.isWithToken = true, diff --git a/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart index 46b11532..cab65b6a 100644 --- a/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart +++ b/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart @@ -2,10 +2,11 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:selfprivacy/config/get_it_config.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider.dart'; +import 'package:selfprivacy/logic/api_maps/generic_result.dart'; +import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart'; import 'package:selfprivacy/logic/models/hive/server_domain.dart'; -class DesecApi extends DnsProviderApi { +class DesecApi extends ApiMap { DesecApi({ this.hasLogger = false, this.isWithToken = true, diff --git a/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart index 8f0a8b3d..76f9e78e 100644 --- a/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart +++ b/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart @@ -2,11 +2,12 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:selfprivacy/config/get_it_config.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider.dart'; +import 'package:selfprivacy/logic/api_maps/generic_result.dart'; +import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart'; import 'package:selfprivacy/logic/models/hive/server_domain.dart'; import 'package:selfprivacy/logic/models/json/dns_records.dart'; -class DigitalOceanDnsApi extends DnsProviderApi { +class DigitalOceanDnsApi extends ApiMap { DigitalOceanDnsApi({ this.hasLogger = false, this.isWithToken = true, diff --git a/lib/logic/api_maps/rest_maps/dns_providers/dns_provider.dart b/lib/logic/api_maps/rest_maps/dns_providers/dns_provider.dart deleted file mode 100644 index 3d74d5db..00000000 --- a/lib/logic/api_maps/rest_maps/dns_providers/dns_provider.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart'; -export 'package:selfprivacy/logic/api_maps/generic_result.dart'; -export 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/desired_dns_record.dart'; - -class DomainNotFoundException implements Exception { - DomainNotFoundException(this.message); - final String message; -} - -abstract class DnsProviderApi extends ApiMap {} diff --git a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart index 976ddb6b..b3e39e66 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart @@ -2,7 +2,6 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:selfprivacy/config/get_it_config.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/volume_provider.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider.dart'; import 'package:selfprivacy/logic/api_maps/tls_options.dart'; import 'package:selfprivacy/logic/models/disk_size.dart'; @@ -10,7 +9,7 @@ import 'package:selfprivacy/logic/models/hive/user.dart'; import 'package:selfprivacy/logic/models/json/digital_ocean_server_info.dart'; import 'package:selfprivacy/utils/password_generator.dart'; -class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { +class DigitalOceanApi extends ServerProviderApi { DigitalOceanApi({ required this.region, this.hasLogger = true, diff --git a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart index b8ec3c26..2d4907e2 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart @@ -2,7 +2,6 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:selfprivacy/config/get_it_config.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/volume_provider.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider.dart'; import 'package:selfprivacy/logic/api_maps/tls_options.dart'; import 'package:selfprivacy/logic/models/disk_size.dart'; @@ -10,7 +9,7 @@ import 'package:selfprivacy/logic/models/json/hetzner_server_info.dart'; import 'package:selfprivacy/logic/models/hive/user.dart'; import 'package:selfprivacy/utils/password_generator.dart'; -class HetznerApi extends ServerProviderApi with VolumeProviderApi { +class HetznerApi extends ServerProviderApi { HetznerApi({ this.region, this.hasLogger = true, diff --git a/lib/logic/api_maps/rest_maps/server_providers/volume_provider.dart b/lib/logic/api_maps/rest_maps/server_providers/volume_provider.dart deleted file mode 100644 index 5ddacd6d..00000000 --- a/lib/logic/api_maps/rest_maps/server_providers/volume_provider.dart +++ /dev/null @@ -1,5 +0,0 @@ -import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart'; - -export 'package:selfprivacy/logic/api_maps/generic_result.dart'; - -mixin VolumeProviderApi on ApiMap {} diff --git a/lib/logic/cubit/dns_records/dns_records_cubit.dart b/lib/logic/cubit/dns_records/dns_records_cubit.dart index 91067d06..3fc2d199 100644 --- a/lib/logic/cubit/dns_records/dns_records_cubit.dart +++ b/lib/logic/cubit/dns_records/dns_records_cubit.dart @@ -1,5 +1,5 @@ import 'package:cubit_form/cubit_form.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider.dart'; +import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/desired_dns_record.dart'; import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart'; import 'package:selfprivacy/logic/models/hive/server_domain.dart'; import 'package:selfprivacy/logic/models/json/dns_records.dart'; diff --git a/lib/logic/providers/dns_providers/cloudflare.dart b/lib/logic/providers/dns_providers/cloudflare.dart index 1f53761d..abd4f1ba 100644 --- a/lib/logic/providers/dns_providers/cloudflare.dart +++ b/lib/logic/providers/dns_providers/cloudflare.dart @@ -1,5 +1,5 @@ import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider.dart'; +import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/desired_dns_record.dart'; import 'package:selfprivacy/logic/models/hive/server_domain.dart'; import 'package:selfprivacy/logic/models/json/dns_records.dart'; import 'package:selfprivacy/logic/providers/dns_providers/dns_provider.dart'; diff --git a/lib/logic/providers/dns_providers/digital_ocean_dns.dart b/lib/logic/providers/dns_providers/digital_ocean_dns.dart index e72c48fc..7f852a44 100644 --- a/lib/logic/providers/dns_providers/digital_ocean_dns.dart +++ b/lib/logic/providers/dns_providers/digital_ocean_dns.dart @@ -1,5 +1,5 @@ +import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/desired_dns_record.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider.dart'; import 'package:selfprivacy/logic/models/hive/server_domain.dart'; import 'package:selfprivacy/logic/models/json/dns_records.dart'; import 'package:selfprivacy/logic/providers/dns_providers/dns_provider.dart';