created ElasticActionController

used by actions that map directly to an ES request/response

app/controllers/ClearIndexCacheController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.clearIndexCache
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class ClearIndexCacheController extends ElasticActionController {
 
-class ClearIndexCacheController extends BaseController {
-
-  def processRequest = { request =>
-    clearIndexCache(request.get("indices"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => clearIndexCache(request.get("indices"), request.host)
 
 }

app/controllers/CloseIndexController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.closeIndex
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class CloseIndexController extends ElasticActionController {
 
-class CloseIndexController extends BaseController {
-
-  def processRequest = { request =>
-    closeIndex(request.get("indices"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => closeIndex(request.get("indices"), request.host)
 
 }

app/controllers/ClusterOverviewController.scala

@@ -6,7 +6,6 @@ import models.overview.ClusterOverview
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
-
 class ClusterOverviewController extends BaseController {
 
   def processRequest = {

app/controllers/DeleteIndexController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.deleteIndex
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class DeleteIndexController extends ElasticActionController {
 
-class DeleteIndexController extends BaseController {
-
-  def processRequest = { request =>
-    deleteIndex(request.get("indices"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => deleteIndex(request.get("indices"), request.host)
 
 }

app/controllers/DisableShardAllocationController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.disableShardAllocation
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class DisableShardAllocationController extends ElasticActionController {
 
-class DisableShardAllocationController extends BaseController {
-
-  def processRequest = { request =>
-    disableShardAllocation(request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => disableShardAllocation(request.host)
 
 }

app/controllers/ElasticActionController.scala

+package controllers
+
+import elastic.ElasticResponse
+import models.CerebroRequest
+
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.Future
+
+trait ElasticActionController extends BaseController {
+
+  def processRequest = request => processElasticRequest(request).map {
+    response => Status(response.status)(response.body)
+  }
+
+  def processElasticRequest: CerebroRequest => Future[ElasticResponse]
+
+}

app/controllers/EnableShardAllocationController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.enableShardAllocation
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class EnableShardAllocationController extends ElasticActionController {
 
-class EnableShardAllocationController extends BaseController {
-
-  def processRequest = { request =>
-    enableShardAllocation(request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => enableShardAllocation(request.host)
 
 }

app/controllers/GetIndexMapping.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.getIndexMapping
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class GetIndexMapping extends ElasticActionController {
 
-class GetIndexMapping extends BaseController {
-
-  def processRequest = { request =>
-    getIndexMapping(request.get("index"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => getIndexMapping(request.get("index"), request.host)
 
 }

app/controllers/GetIndexSettings.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.getIndexSettings
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class GetIndexSettings extends ElasticActionController {
 
-class GetIndexSettings extends BaseController {
-
-  def processRequest = { request =>
-    getIndexSettings(request.get("index"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => getIndexSettings(request.get("index"), request.host)
 
 }

app/controllers/Main.scala

 package controllers
 
 import elastic.ElasticClient
-import scala.concurrent.ExecutionContext.Implicits.global
 
-class Main extends BaseController {
+class Main extends ElasticActionController {
 
-  def processRequest = { request =>
-    ElasticClient.main(request.host).map { response =>
-      Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => ElasticClient.main(request.host)
 
 }

app/controllers/NodeStatsController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.nodesStats
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class NodeStatsController extends ElasticActionController {
 
-class NodeStatsController extends BaseController {
-
-  def processRequest = { request =>
-    nodesStats(request.get("node"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => nodesStats(request.get("node"), request.host)
 
 }

app/controllers/OpenIndexController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.openIndex
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class OpenIndexController extends ElasticActionController {
 
-class OpenIndexController extends BaseController {
-
-  def processRequest = { request =>
-    openIndex(request.get("indices"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => openIndex(request.get("indices"), request.host)
 
 }

app/controllers/OptimizeIndexController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.optimizeIndex
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class OptimizeIndexController extends ElasticActionController {
 
-class OptimizeIndexController extends BaseController {
-
-  def processRequest = { request =>
-    optimizeIndex(request.get("indices"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => optimizeIndex(request.get("indices"), request.host)
 
 }

app/controllers/PutClusterSettings.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.putClusterSettings
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class PutClusterSettings extends ElasticActionController {
 
-class PutClusterSettings extends BaseController {
-
-  def processRequest = { request =>
-    putClusterSettings(request.get("settings"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => putClusterSettings(request.get("settings"), request.host)
 
 }

app/controllers/RefreshIndexController.scala

@@ -2,14 +2,8 @@ package controllers
 
 import elastic.ElasticClient.refreshIndex
 
-import scala.concurrent.ExecutionContext.Implicits.global
+class RefreshIndexController extends ElasticActionController {
 
-class RefreshIndexController extends BaseController {
-
-  def processRequest = { request =>
-    refreshIndex(request.get("indices"), request.host).map {
-      response => Status(response.status)(response.body)
-    }
-  }
+  def processElasticRequest = request => refreshIndex(request.get("indices"), request.host)
 
 }