Clear Cache API: Streamline option names

closes elastic#2890
adamggg · Apr 12, 2013 · d385e1b · d385e1b
1 parent a2d7269
commit d385e1b
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/.../org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java b/.../org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java
@@ -63,9 +63,24 @@ public void handleRequest(final RestRequest request, final RestChannel channel)
             clearIndicesCacheRequest.ignoreIndices(IgnoreIndices.fromString(request.param("ignore_indices")));
         }
         try {
-            clearIndicesCacheRequest.filterCache(request.paramAsBoolean("filter", clearIndicesCacheRequest.filterCache()));
-            clearIndicesCacheRequest.fieldDataCache(request.paramAsBoolean("field_data", clearIndicesCacheRequest.fieldDataCache()));
-            clearIndicesCacheRequest.idCache(request.paramAsBoolean("id", clearIndicesCacheRequest.idCache()));
+            if (request.hasParam("filter")) {
+                clearIndicesCacheRequest.filterCache(request.paramAsBoolean("filter", clearIndicesCacheRequest.filterCache()));
+            }
+            if (request.hasParam("filter_cache")) {
+                clearIndicesCacheRequest.filterCache(request.paramAsBoolean("filter_cache", clearIndicesCacheRequest.filterCache()));
+            }
+            if (request.hasParam("field_data")) {
+                clearIndicesCacheRequest.fieldDataCache(request.paramAsBoolean("field_data", clearIndicesCacheRequest.fieldDataCache()));
+            }
+            if (request.hasParam("fielddata")) {
+                clearIndicesCacheRequest.fieldDataCache(request.paramAsBoolean("fielddata", clearIndicesCacheRequest.fieldDataCache()));
+            }
+            if (request.hasParam("id")) {
+                clearIndicesCacheRequest.idCache(request.paramAsBoolean("id", clearIndicesCacheRequest.idCache()));
+            }
+            if (request.hasParam("id_cache")) {
+                clearIndicesCacheRequest.idCache(request.paramAsBoolean("id_cache", clearIndicesCacheRequest.idCache()));
+            }
             clearIndicesCacheRequest.fields(request.paramAsStringArray("fields", clearIndicesCacheRequest.fields()));
             clearIndicesCacheRequest.filterKeys(request.paramAsStringArray("filter_keys", clearIndicesCacheRequest.filterKeys()));