diff --git a/app/controllers/ClearIndexCacheController.scala b/app/controllers/ClearIndexCacheController.scala index e406d119176d9c0463161ed4a514082581ea41c2..7c38549d23bac348a3c65fdfabcdb057fc90bdfb 100644 --- a/app/controllers/ClearIndexCacheController.scala +++ b/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) } diff --git a/app/controllers/CloseIndexController.scala b/app/controllers/CloseIndexController.scala index 0b0bbc60508b96a1d9f10e56eb7f6f120903658d..d1adb1a7fcead4af31a84ec91ffba6c1dc91c825 100644 --- a/app/controllers/CloseIndexController.scala +++ b/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) } diff --git a/app/controllers/ClusterOverviewController.scala b/app/controllers/ClusterOverviewController.scala index 8e8963a286df9851c6e4140825b6dfa63a8a910d..44af6cf32106ef90ab75d27197c5991667672bbe 100644 --- a/app/controllers/ClusterOverviewController.scala +++ b/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 = { diff --git a/app/controllers/DeleteIndexController.scala b/app/controllers/DeleteIndexController.scala index 1a88776e040d4675e6705463bce5f93f3b481da0..491f54de3cd8352e358f0f1baaa8e5de9441ecb4 100644 --- a/app/controllers/DeleteIndexController.scala +++ b/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) } diff --git a/app/controllers/DisableShardAllocationController.scala b/app/controllers/DisableShardAllocationController.scala index 693e1123ef81465993a618847956ee7df6047022..e26090e9c483869b69f94a034814280e2d933982 100644 --- a/app/controllers/DisableShardAllocationController.scala +++ b/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) } diff --git a/app/controllers/ElasticActionController.scala b/app/controllers/ElasticActionController.scala new file mode 100644 index 0000000000000000000000000000000000000000..704d46ab698622e940e140861434947b91f0249b --- /dev/null +++ b/app/controllers/ElasticActionController.scala @@ -0,0 +1,17 @@ +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] + +} diff --git a/app/controllers/EnableShardAllocationController.scala b/app/controllers/EnableShardAllocationController.scala index 0c5f511336fdd2ff7df08e88133264a8dc249b7d..0db3252bf7f08e1abb4ccb6a3679f991581a6b6d 100644 --- a/app/controllers/EnableShardAllocationController.scala +++ b/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) } diff --git a/app/controllers/GetIndexMapping.scala b/app/controllers/GetIndexMapping.scala index c71086d8b033ebfc84d2cf074c6b4a8ebf3704ad..fab353eaebfbf0c4847525250d8a3d81e7209694 100644 --- a/app/controllers/GetIndexMapping.scala +++ b/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) } diff --git a/app/controllers/GetIndexSettings.scala b/app/controllers/GetIndexSettings.scala index b7e8839ddceaa08d6c3c548dbadd7da8181bad0d..c98bde15102a4f9d6ed6865cf0a6be73207401ae 100644 --- a/app/controllers/GetIndexSettings.scala +++ b/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) } diff --git a/app/controllers/Main.scala b/app/controllers/Main.scala index c3e5bfcbc7abdd64ccf8bd676a3ee45b4089b5bf..3db710418478a9d8e83a26a8868c4aab6502c2d3 100644 --- a/app/controllers/Main.scala +++ b/app/controllers/Main.scala @@ -1,14 +1,9 @@ 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) } diff --git a/app/controllers/NodeStatsController.scala b/app/controllers/NodeStatsController.scala index a10bfe7651397bb98b19a5ab3e4c9cecf2a8254f..eaa4c31ceab67d5520ee6ca6b2ebf3847601f115 100644 --- a/app/controllers/NodeStatsController.scala +++ b/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) } diff --git a/app/controllers/OpenIndexController.scala b/app/controllers/OpenIndexController.scala index 14768001a5146ae96715ef5770318b330ac2aba0..fb7410da66456a9eb9a9f1e0012d2ec0fd098597 100644 --- a/app/controllers/OpenIndexController.scala +++ b/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) } diff --git a/app/controllers/OptimizeIndexController.scala b/app/controllers/OptimizeIndexController.scala index 05ece779504f629397a895b0d51bda7a8db8b90c..c64e2f04af127ffa0822a6c8a6363bf993eb499f 100644 --- a/app/controllers/OptimizeIndexController.scala +++ b/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) } diff --git a/app/controllers/PutClusterSettings.scala b/app/controllers/PutClusterSettings.scala index f649188fdfed988b6d4e203cd45068bde2abb74c..a2b18b7876236ab0491b4eb9388a524ccee46354 100644 --- a/app/controllers/PutClusterSettings.scala +++ b/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) } diff --git a/app/controllers/RefreshIndexController.scala b/app/controllers/RefreshIndexController.scala index 012b9cf56dc90ec3b9e48fa048d2d99734f6edec..36d90c26b12eb0d8ae89b0da9bfec4d287463dbc 100644 --- a/app/controllers/RefreshIndexController.scala +++ b/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) }