From 1ba52fac865f99c266829119b5b28b8dc3dfb656 Mon Sep 17 00:00:00 2001 From: epriestley Date: Fri, 27 Dec 2013 13:15:30 -0800 Subject: [PATCH] Introduce DrydockQuery to slightly reduce code duplication Summary: Ref T2015. All the Drydock query classes share the application method; move it into a shared base class to slightly shrink the codebase. Test Plan: Browsed query UIs. Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T2015 Differential Revision: https://secure.phabricator.com/D7837 --- src/__phutil_library_map__.php | 10 ++++++---- .../drydock/query/DrydockBlueprintQuery.php | 7 +------ src/applications/drydock/query/DrydockLeaseQuery.php | 7 +------ src/applications/drydock/query/DrydockLogQuery.php | 6 +----- src/applications/drydock/query/DrydockQuery.php | 10 ++++++++++ .../drydock/query/DrydockResourceQuery.php | 7 +------ 6 files changed, 20 insertions(+), 27 deletions(-) create mode 100644 src/applications/drydock/query/DrydockQuery.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index d5fe8008fb..e52be6e81e 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -676,6 +676,7 @@ phutil_register_library_map(array( 'DrydockPHIDTypeLease' => 'applications/drydock/phid/DrydockPHIDTypeLease.php', 'DrydockPHIDTypeResource' => 'applications/drydock/phid/DrydockPHIDTypeResource.php', 'DrydockPreallocatedHostBlueprintImplementation' => 'applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php', + 'DrydockQuery' => 'applications/drydock/query/DrydockQuery.php', 'DrydockResource' => 'applications/drydock/storage/DrydockResource.php', 'DrydockResourceCloseController' => 'applications/drydock/controller/DrydockResourceCloseController.php', 'DrydockResourceController' => 'applications/drydock/controller/DrydockResourceController.php', @@ -3055,7 +3056,7 @@ phutil_register_library_map(array( 0 => 'DrydockBlueprintController', 1 => 'PhabricatorApplicationSearchResultsControllerInterface', ), - 'DrydockBlueprintQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DrydockBlueprintQuery' => 'DrydockQuery', 'DrydockBlueprintSearchEngine' => 'PhabricatorApplicationSearchEngine', 'DrydockBlueprintViewController' => 'DrydockBlueprintController', 'DrydockCommandInterface' => 'DrydockInterface', @@ -3074,7 +3075,7 @@ phutil_register_library_map(array( 0 => 'DrydockLeaseController', 1 => 'PhabricatorApplicationSearchResultsControllerInterface', ), - 'DrydockLeaseQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DrydockLeaseQuery' => 'DrydockQuery', 'DrydockLeaseReleaseController' => 'DrydockLeaseController', 'DrydockLeaseSearchEngine' => 'PhabricatorApplicationSearchEngine', 'DrydockLeaseStatus' => 'DrydockConstants', @@ -3092,7 +3093,7 @@ phutil_register_library_map(array( 0 => 'DrydockLogController', 1 => 'PhabricatorApplicationSearchResultsControllerInterface', ), - 'DrydockLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DrydockLogQuery' => 'DrydockQuery', 'DrydockLogSearchEngine' => 'PhabricatorApplicationSearchEngine', 'DrydockManagementCloseWorkflow' => 'DrydockManagementWorkflow', 'DrydockManagementCreateResourceWorkflow' => 'DrydockManagementWorkflow', @@ -3103,6 +3104,7 @@ phutil_register_library_map(array( 'DrydockPHIDTypeLease' => 'PhabricatorPHIDType', 'DrydockPHIDTypeResource' => 'PhabricatorPHIDType', 'DrydockPreallocatedHostBlueprintImplementation' => 'DrydockBlueprintImplementation', + 'DrydockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'DrydockResource' => array( 0 => 'DrydockDAO', @@ -3115,7 +3117,7 @@ phutil_register_library_map(array( 0 => 'DrydockResourceController', 1 => 'PhabricatorApplicationSearchResultsControllerInterface', ), - 'DrydockResourceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'DrydockResourceQuery' => 'DrydockQuery', 'DrydockResourceSearchEngine' => 'PhabricatorApplicationSearchEngine', 'DrydockResourceStatus' => 'DrydockConstants', 'DrydockResourceViewController' => 'DrydockResourceController', diff --git a/src/applications/drydock/query/DrydockBlueprintQuery.php b/src/applications/drydock/query/DrydockBlueprintQuery.php index 066677f6bf..72d9d9ada8 100644 --- a/src/applications/drydock/query/DrydockBlueprintQuery.php +++ b/src/applications/drydock/query/DrydockBlueprintQuery.php @@ -1,7 +1,6 @@ formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDrydock'; - } - } diff --git a/src/applications/drydock/query/DrydockLeaseQuery.php b/src/applications/drydock/query/DrydockLeaseQuery.php index 6dd08d00e3..21e6319dda 100644 --- a/src/applications/drydock/query/DrydockLeaseQuery.php +++ b/src/applications/drydock/query/DrydockLeaseQuery.php @@ -1,7 +1,6 @@ formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDrydock'; - } - } diff --git a/src/applications/drydock/query/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php index 880c56a77c..0488fb204a 100644 --- a/src/applications/drydock/query/DrydockLogQuery.php +++ b/src/applications/drydock/query/DrydockLogQuery.php @@ -1,6 +1,6 @@ formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDrydock'; - } - } diff --git a/src/applications/drydock/query/DrydockQuery.php b/src/applications/drydock/query/DrydockQuery.php new file mode 100644 index 0000000000..68fe919858 --- /dev/null +++ b/src/applications/drydock/query/DrydockQuery.php @@ -0,0 +1,10 @@ +formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDrydock'; - } - }