Do not arbitrary add include_type_name

ruflin · Aug 28, 2019 · 0687884 · 0687884
1 parent e9c85c9
commit 0687884
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/Elastica/Index.php b/lib/Elastica/Index.php
@@ -583,13 +583,9 @@ public function request($path, $method, $data = [], array $query = [])
     public function requestEndpoint(AbstractEndpoint $endpoint)
     {
         $cloned = clone $endpoint;
-
         $cloned->setIndex($this->getName());
-        if ($endpoint instanceof Create || $endpoint instanceof \Elasticsearch\Endpoints\Indices\Mapping\Put) {
-            $cloned->setParams(['include_type_name' => true]);
-        }
 
-        return $this->getClient()->requestEndpoint($cloned);
+        return $this->getClient()->requestEndpoint($endpoint);
     }
 
     /**

diff --git a/test/Elastica/ClientTest.php b/test/Elastica/ClientTest.php
@@ -219,9 +219,9 @@ public function testBulk()
         $client = $this->_getClient();
 
         $params = [
-            ['index' => ['_index' => 'test', '_type' => '_doc', '_id' => '1']],
+            ['index' => ['_index' => 'test', '_id' => '1']],
             ['user' => ['name' => 'hans']],
-            ['index' => ['_index' => 'test', '_type' => '_doc', '_id' => '2']],
+            ['index' => ['_index' => 'test', '_id' => '2']],
             ['user' => ['name' => 'peter']],
         ];