iter

elastic · Dec 14, 2018 · e901dba · e901dba
1 parent 74997b4
commit e901dba
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/docs/reference/docs/get.asciidoc b/docs/reference/docs/get.asciidoc
@@ -7,7 +7,7 @@ twitter with id valued 0:
 
 [source,js]
 --------------------------------------------------
-GET twitter/0
+GET twitter/_doc/0
 --------------------------------------------------
 // CONSOLE
 // TEST[setup:twitter]
@@ -217,13 +217,13 @@ will fail.
 [[_source]]
 === Getting the +_source+ directly
 
-Use the `/{index}/{id}/_source` endpoint to get
+Use the `/{index}/_source/{id}` endpoint to get
 just the `_source` field of the document,
 without any additional content around it. For example:
 
 [source,js]
 --------------------------------------------------
-GET twitter/_doc/1/_source
+GET twitter/_source/1
 --------------------------------------------------
 // CONSOLE
 // TEST[continued]
@@ -232,7 +232,7 @@ You can also use the same source filtering parameters to control which parts of
 
 [source,js]
 --------------------------------------------------
-GET twitter/_doc/1/_source?_source_includes=*.id&_source_excludes=entities'
+GET twitter/_source/1/?_source_includes=*.id&_source_excludes=entities'
 --------------------------------------------------
 // CONSOLE
 // TEST[continued]
@@ -242,7 +242,7 @@ An existing document will not have a _source if it is disabled in the <<mapping-
 
 [source,js]
 --------------------------------------------------
-HEAD twitter/_doc/1/_source
+HEAD twitter/_source/1
 --------------------------------------------------
 // CONSOLE
 // TEST[continued]

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/11_basic_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/11_basic_with_types.yml
@@ -9,8 +9,6 @@
         body:  { "foo": "bar" }
 
   - do:
-      warnings:
-        - '[types removal] Specifying types in get_source requests is deprecated.'
       get_source:
         index: test_1
         type:  test

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/41_routing_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/41_routing_with_types.yml
@@ -2,10 +2,6 @@
 "Routing":
 
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
  - do:
      indices.create:
        index:    test_1

diff --git a/...-spec/src/main/resources/rest-api-spec/test/get_source/71_source_filtering_with_types.yml b/...-spec/src/main/resources/rest-api-spec/test/get_source/71_source_filtering_with_types.yml
@@ -2,10 +2,6 @@
 "Source filtering":
 
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
   - do:
       index:
         index:  test_1

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml
@@ -1,10 +1,11 @@
+---
+"Missing document with catch":
+
   - skip:
+      features: warnings
       version: " - 6.99.99"
       reason: types are required in requests before 7.0.0
 
----
-"Missing document with catch":
-
   - do:
       catch:   missing
       get_source:
@@ -14,6 +15,11 @@
 ---
 "Missing document with ignore":
 
+  - skip:
+      features: warnings
+      version: " - 6.99.99"
+      reason: types are required in requests before 7.0.0
+
   - do:
       get_source:
         index:  test_1