From 661ed9eb44aba86a5b3ef86c9f8c68ad179b4b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=BAlvio=20Abrah=C3=A3o=20de=20Paula?= Date: Mon, 14 Aug 2023 11:07:07 -0700 Subject: [PATCH] Isolate duplicated code in DatabasesManager. Reviewed By: lblasa Differential Revision: D48316900 fbshipit-source-id: 2ae984f0d6f10b9cb843a74f335c77428d2229ef --- .../DatabasesManager.m | 55 ++++++++----------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m b/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m index 939969251..b97a3cf05 100644 --- a/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m +++ b/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m @@ -91,19 +91,13 @@ DatabaseGetTableDataRequest* request = [DatabaseGetTableDataRequest getTableDataRequestFromDictionary:params]; if (!request) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesInvalidRequest - message:kDatabasesErrorCodesInvalidRequestMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseInvalidRequestError:responder]; return; } DatabaseDescriptorHolder* descriptorHolder = self.databaseDescriptorHolders[@(request.databaseId)]; if (!descriptorHolder) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesDatabaseInvalid - message:kDatabasesErrorCodesDatabaseInvalidMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseDatabaseInvalidError:responder]; return; } @@ -137,20 +131,13 @@ getTableStructureRequestFromDictionary:params]; if (!request) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesInvalidRequest - message:kDatabasesErrorCodesInvalidRequestMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseInvalidRequestError:responder]; return; } - DatabaseDescriptorHolder* descriptorHolder = self.databaseDescriptorHolders[@(request.databaseId)]; if (!descriptorHolder) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesDatabaseInvalid - message:kDatabasesErrorCodesDatabaseInvalidMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseDatabaseInvalidError:responder]; return; } @@ -178,19 +165,13 @@ DatabaseGetTableInfoRequest* request = [DatabaseGetTableInfoRequest getTableInfoRequestFromDictionary:params]; if (!request) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesInvalidRequest - message:kDatabasesErrorCodesInvalidRequestMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseInvalidRequestError:responder]; return; } DatabaseDescriptorHolder* descriptorHolder = self.databaseDescriptorHolders[@(request.databaseId)]; if (!descriptorHolder) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesDatabaseInvalid - message:kDatabasesErrorCodesDatabaseInvalidMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseDatabaseInvalidError:responder]; return; } @@ -218,19 +199,13 @@ DatabaseExecuteSqlRequest* request = [DatabaseExecuteSqlRequest getExecuteSqlRequestFromDictionary:params]; if (!request) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesInvalidRequest - message:kDatabasesErrorCodesInvalidRequestMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseInvalidRequestError:responder]; return; } DatabaseDescriptorHolder* descriptorHolder = self.databaseDescriptorHolders[@(request.databaseId)]; if (!descriptorHolder) { - NSDictionary* errorResponse = [ObjectMapper - errorWithCode:DatabasesErrorCodesDatabaseInvalid - message:kDatabasesErrorCodesDatabaseInvalidMessage]; - [responder error:errorResponse]; + [DatabasesManager raiseDatabaseInvalidError:responder]; return; } @try { @@ -249,4 +224,18 @@ }]; } ++ (void)raiseInvalidRequestError:(id)responder { + NSDictionary* errorResponse = + [ObjectMapper errorWithCode:DatabasesErrorCodesInvalidRequest + message:kDatabasesErrorCodesInvalidRequestMessage]; + [responder error:errorResponse]; +} + ++ (void)raiseDatabaseInvalidError:(id)responder { + NSDictionary* errorResponse = + [ObjectMapper errorWithCode:DatabasesErrorCodesDatabaseInvalid + message:kDatabasesErrorCodesDatabaseInvalidMessage]; + [responder error:errorResponse]; +} + @end