Merge pull request elastic/elasticsearch#265 from GaelTadh/api_namespace_changes

Change watcher REST API call namespace to be watcher.

Original commit: elastic/x-pack-elasticsearch@7a80eb522b

pom.xml

@@ -31,7 +31,7 @@
         <tests.heap.size>512m</tests.heap.size>
         <tests.topn>5</tests.topn>
         <execution.hint.file>.local-${project.version}-execution-hints.log</execution.hint.file>
-        <tests.rest>false</tests.rest>
+        <tests.rest>true</tests.rest>
         <tests.slow>false</tests.slow>
         <tests.timewarp>true</tests.timewarp>
     </properties>

rest-api-spec/api/watcher.ack_watch.json

@@ -1,5 +1,5 @@
 {
-  "ack_watch": {
+  "watcher.ack_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-ack-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null

rest-api-spec/api/watcher.delete_watch.json

@@ -1,5 +1,5 @@
 {
-  "delete_watch": {
+  "watcher.delete_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-delete-watch.html",
     "methods": [ "DELETE" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null

rest-api-spec/api/watcher.execute_watch.json

@@ -1,5 +1,5 @@
 {
-  "execute_watch": {
+  "watcher.execute_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-execute-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": {

rest-api-spec/api/watcher.get_watch.json

@@ -1,5 +1,5 @@
 {
-  "get_watch": {
+  "watcher.get_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-get-watch.html",
     "methods": [ "GET" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null

rest-api-spec/api/watcher.info.json

@@ -1,5 +1,5 @@
 {
-  "watcher_info": {
+  "watcher.info": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-info.html",
     "methods": [ "GET" ],
     "url": {

rest-api-spec/api/watcher.put_watch.json

@@ -1,5 +1,5 @@
 {
-  "put_watch": {
+  "watcher.put_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-put-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {

rest-api-spec/api/watcher.restart.json

@@ -1,5 +1,5 @@
 {
-  "restart_watcher": {
+  "watcher.restart": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html",
     "methods": [ "PUT" ],
     "url": {

rest-api-spec/api/watcher.start.json

@@ -1,5 +1,5 @@
 {
-  "start_watcher": {
+  "watcher.start": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html",
     "methods": [ "PUT" ],
     "url": {

rest-api-spec/api/watcher.stats.json

@@ -1,5 +1,5 @@
 {
-  "watcher_stats": {
+  "watcher.stats": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-stats.html",
     "methods": [ "GET" ],
     "url": {
@@ -8,11 +8,6 @@
       "parts": {
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null

rest-api-spec/api/watcher.stop.json

@@ -1,5 +1,5 @@
 {
-  "stop_watcher": {
+  "watcher.stop": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html",
     "methods": [ "PUT" ],
     "url": {

rest-api-spec/test/ack_watch/10_basic.yaml

@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {
@@ -43,11 +43,11 @@
           wait_for_status: green
 
   - do:
-    ack_watch:
+    watcher.ack_watch:
       id: "my_watch"
   - match: { "status.ack.state" : "awaits_execution" }
 
   - do:
-    delete_watch:
+    watcher.delete_watch:
       id: "my_watch"
   - match: { found: true }

rest-api-spec/test/delete_watch/10_basic.yaml

@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {
@@ -39,6 +39,6 @@
   - match: { _id: "my_watch" }
 
   - do:
-    delete_watch:
+    watcher.delete_watch:
       id: "my_watch"
   - match: { found: true }

rest-api-spec/test/execute_watch/10_basic.yaml

@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put_watch:
         id: "my_exe_watch"
         body:  > 
           {
@@ -55,7 +55,7 @@
   - match: { _id: "my_exe_watch" }
 
   - do:
-      execute_watch:
+      watcher.execute_watch:
         id: "my_exe_watch"
         body: >
           {

rest-api-spec/test/execute_watch/20_empty_body.yaml

@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put_watch:
         id: "my_logging_watch"
         body:  > 
           {
@@ -53,7 +53,7 @@
   - match: { _id: "my_logging_watch" }
 
   - do:
-      execute_watch:
+      watcher.execute_watch:
         id: "my_logging_watch"
         body: null
 

rest-api-spec/test/get_watch/10_basic.yaml

@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {
@@ -41,7 +41,7 @@
   - match: { created: true }
 
   - do:
-      get_watch:
+      watcher.get_watch:
         id: "my_watch"
   - match: { found : true}
   - match: { _id: "my_watch" }

rest-api-spec/test/put_watch/10_basic.yaml

@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {

rest-api-spec/test/restart_watcher/10_basic.yaml

@@ -4,5 +4,5 @@
       cluster.health:
           wait_for_status: green
 
-  - do: {restart_watcher: {}}
+  - do: {watcher.restart: {}}
   - match: { acknowledged: true }

rest-api-spec/test/start_watcher/10_basic.yaml

@@ -4,5 +4,5 @@
       cluster.health:
           wait_for_status: green
 
-  - do: {start_watcher: {}}
+  - do: {watcher.start: {}}
   - match: { acknowledged: true }

rest-api-spec/test/stats/10_basic.yaml

@@ -1,7 +1,5 @@
 ---
 "Test watcher stats output":
 
-  - do:
-      watcher_stats:
-        pretty: true
+  - do: {watcher.stats: {}}
   - match: { "watch_service_state": "started" }

rest-api-spec/test/stop_watcher/10_basic.yaml

@@ -4,8 +4,8 @@
       cluster.health:
           wait_for_status: green
 
-  - do: {stop_watcher: {}}
+  - do: {watcher.stop: {}}
   - match: { acknowledged: true }
 
-  - do: {start_watcher: {}}
+  - do: {watcher.start: {}}
   - match: { acknowledged: true }

rest-api-spec/test/watch_info/10_basic.yaml

@@ -1,6 +1,6 @@
 ---
 "Test watcher info api":
-  - do: {watcher_info: {}}
+  - do: {watcher.info: {}}
   - is_true:    version.build_hash
   - is_true:    version.build_timestamp
   - is_true:    version.build_snapshot