Update Drydock for handleRequest

Summary: Poked through the Drydock controllers and updated the codes.

Test Plan: Built random fake stuff in Drydock

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13731

src/applications/drydock/controller/DrydockBlueprintCreateController.php

@@ -3,9 +3,8 @@
 final class DrydockBlueprintCreateController
   extends DrydockBlueprintController {
 
-  public function processRequest() {
+  public function handleRequest(AphrontRequest $request) {
-    $request = $this->getRequest();
+    $viewer = $request->getViewer();
-    $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
       DrydockCreateBlueprintsCapability::CAPABILITY);

src/applications/drydock/controller/DrydockBlueprintEditController.php

@@ -2,20 +2,14 @@
 
 final class DrydockBlueprintEditController extends DrydockBlueprintController {
 
-  private $id;
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('id');
 
-  public function willProcessRequest(array $data) {
+    if ($id) {
-    $this->id = idx($data, 'id');
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
-
-    if ($this->id) {
       $blueprint = id(new DrydockBlueprintQuery())
         ->setViewer($viewer)
-        ->withIDs(array($this->id))
+        ->withIDs(array($id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
@@ -27,7 +21,7 @@ final class DrydockBlueprintEditController extends DrydockBlueprintController {
       }
 
       $impl = $blueprint->getImplementation();
-      $cancel_uri = $this->getApplicationURI('blueprint/'.$this->id.'/');
+      $cancel_uri = $this->getApplicationURI('blueprint/'.$id.'/');
     } else {
       $this->requireApplicationCapability(
         DrydockCreateBlueprintsCapability::CAPABILITY);

src/applications/drydock/controller/DrydockBlueprintListController.php

@@ -2,20 +2,16 @@
 
 final class DrydockBlueprintListController extends DrydockBlueprintController {
 
-  private $queryKey;
-
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function willProcessRequest(array $data) {
+  public function handleRequest(AphrontRequest $request) {
-    $this->queryKey = idx($data, 'queryKey');
+    $querykey = $request->getURIData('queryKey');
-  }
 
-  public function processRequest() {
     $request = $this->getRequest();
     $controller = id(new PhabricatorApplicationSearchController())
-      ->setQueryKey($this->queryKey)
+      ->setQueryKey($querykey)
       ->setSearchEngine(new DrydockBlueprintSearchEngine())
       ->setNavigation($this->buildSideNavView());
 

src/applications/drydock/controller/DrydockBlueprintViewController.php

@@ -2,19 +2,13 @@
 
 final class DrydockBlueprintViewController extends DrydockBlueprintController {
 
-  private $id;
+  public function handleRequest(AphrontRequest $request) {
-
+    $viewer = $request->getViewer();
-  public function willProcessRequest(array $data) {
+    $id = $request->getURIData('id');
-    $this->id = $data['id'];
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
 
     $blueprint = id(new DrydockBlueprintQuery())
       ->setViewer($viewer)
-      ->withIDs(array($this->id))
+      ->withIDs(array($id))
       ->executeOne();
     if (!$blueprint) {
       return new Aphront404Response();

src/applications/drydock/controller/DrydockConsoleController.php

@@ -22,9 +22,8 @@ final class DrydockConsoleController extends DrydockController {
     return $nav;
   }
 
-  public function processRequest() {
+  public function handleRequest(AphrontRequest $request) {
-    $request = $this->getRequest();
+    $viewer = $request->getViewer();
-    $viewer = $request->getUser();
 
     $menu = id(new PHUIObjectItemListView())
       ->setUser($viewer);

src/applications/drydock/controller/DrydockLeaseListController.php

@@ -2,19 +2,16 @@
 
 final class DrydockLeaseListController extends DrydockLeaseController {
 
-  private $queryKey;
-
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function willProcessRequest(array $data) {
+  public function handleRequest(AphrontRequest $request) {
-    $this->queryKey = idx($data, 'queryKey');
+    $viewer = $request->getViewer();
-  }
+    $querykey = $request->getURIData('queryKey');
 
-  public function processRequest() {
     $controller = id(new PhabricatorApplicationSearchController())
-      ->setQueryKey($this->queryKey)
+      ->setQueryKey($querykey)
       ->setSearchEngine(new DrydockLeaseSearchEngine())
       ->setNavigation($this->buildSideNavView());
 

src/applications/drydock/controller/DrydockLeaseReleaseController.php

@@ -2,19 +2,13 @@
 
 final class DrydockLeaseReleaseController extends DrydockLeaseController {
 
-  private $id;
+  public function handleRequest(AphrontRequest $request) {
-
+    $viewer = $request->getViewer();
-  public function willProcessRequest(array $data) {
+    $id = $request->getURIData('id');
-    $this->id = $data['id'];
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
 
     $lease = id(new DrydockLeaseQuery())
-      ->setViewer($user)
+      ->setViewer($viewer)
-      ->withIDs(array($this->id))
+      ->withIDs(array($id))
       ->executeOne();
     if (!$lease) {
       return new Aphront404Response();
@@ -25,7 +19,7 @@ final class DrydockLeaseReleaseController extends DrydockLeaseController {
 
     if ($lease->getStatus() != DrydockLeaseStatus::STATUS_ACTIVE) {
       $dialog = id(new AphrontDialogView())
-        ->setUser($user)
+        ->setUser($viewer)
         ->setTitle(pht('Lease Not Active'))
         ->appendChild(
           phutil_tag(
@@ -39,7 +33,7 @@ final class DrydockLeaseReleaseController extends DrydockLeaseController {
 
     if (!$request->isDialogFormPost()) {
       $dialog = id(new AphrontDialogView())
-        ->setUser($user)
+        ->setUser($viewer)
         ->setTitle(pht('Really release lease?'))
         ->appendChild(
           phutil_tag(

src/applications/drydock/controller/DrydockLeaseViewController.php

@@ -2,19 +2,13 @@
 
 final class DrydockLeaseViewController extends DrydockLeaseController {
 
-  private $id;
+  public function handleRequest(AphrontRequest $request) {
-
+    $viewer = $request->getViewer();
-  public function willProcessRequest(array $data) {
+    $id = $request->getURIData('id');
-    $this->id = $data['id'];
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
 
     $lease = id(new DrydockLeaseQuery())
       ->setViewer($viewer)
-      ->withIDs(array($this->id))
+      ->withIDs(array($id))
       ->executeOne();
     if (!$lease) {
       return new Aphront404Response();

src/applications/drydock/controller/DrydockLogListController.php

@@ -2,19 +2,16 @@
 
 final class DrydockLogListController extends DrydockLogController {
 
-  private $queryKey;
-
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function willProcessRequest(array $data) {
+  public function handleRequest(AphrontRequest $request) {
-    $this->queryKey = idx($data, 'queryKey');
+    $viewer = $request->getViewer();
-  }
+    $querykey = $request->getURIData('queryKey');
 
-  public function processRequest() {
     $controller = id(new PhabricatorApplicationSearchController())
-      ->setQueryKey($this->queryKey)
+      ->setQueryKey($querykey)
       ->setSearchEngine(new DrydockLogSearchEngine())
       ->setNavigation($this->buildSideNavView());
 

src/applications/drydock/controller/DrydockResourceCloseController.php

@@ -2,19 +2,13 @@
 
 final class DrydockResourceCloseController extends DrydockResourceController {
 
-  private $id;
+  public function handleRequest(AphrontRequest $request) {
-
+    $viewer = $request->getViewer();
-  public function willProcessRequest(array $data) {
+    $id = $request->getURIData('id');
-    $this->id = $data['id'];
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
 
     $resource = id(new DrydockResourceQuery())
       ->setViewer($viewer)
-      ->withIDs(array($this->id))
+      ->withIDs(array($id))
       ->executeOne();
     if (!$resource) {
       return new Aphront404Response();

src/applications/drydock/controller/DrydockResourceListController.php

@@ -2,19 +2,16 @@
 
 final class DrydockResourceListController extends DrydockResourceController {
 
-  private $queryKey;
-
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function willProcessRequest(array $data) {
+  public function handleRequest(AphrontRequest $request) {
-    $this->queryKey = idx($data, 'queryKey');
+    $viewer = $request->getViewer();
-  }
+    $querykey = $request->getURIData('queryKey');
 
-  public function processRequest() {
     $controller = id(new PhabricatorApplicationSearchController())
-      ->setQueryKey($this->queryKey)
+      ->setQueryKey($querykey)
       ->setSearchEngine(new DrydockResourceSearchEngine())
       ->setNavigation($this->buildSideNavView());
 

src/applications/drydock/controller/DrydockResourceViewController.php

@@ -2,19 +2,13 @@
 
 final class DrydockResourceViewController extends DrydockResourceController {
 
-  private $id;
+  public function handleRequest(AphrontRequest $request) {
-
+    $viewer = $request->getViewer();
-  public function willProcessRequest(array $data) {
+    $id = $request->getURIData('id');
-    $this->id = $data['id'];
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
 
     $resource = id(new DrydockResourceQuery())
       ->setViewer($viewer)
-      ->withIDs(array($this->id))
+      ->withIDs(array($id))
       ->executeOne();
     if (!$resource) {
       return new Aphront404Response();