Merge pull request #814 from feydan/master

Fixing script get and delete by removing lang from endpoint url

Author: ezimuel

docs/build/Elasticsearch/Client.asciidoc

@@ -931,7 +931,6 @@ $response = $client->updateByQuery($params);
 ----
 /*
 $params['id']   = (string) The script ID (Required)
-       ['lang'] = (string) The script language (Required)
        ['body']  = (array) Request body
 */
 
@@ -953,7 +952,6 @@ $response = $client->getScript($params);
 ----
 /*
 $params['id']   = (string) The script ID (Required)
-       ['lang'] = (string) The script language (Required)
        ['body']  = (array) Request body
 */
 
@@ -975,7 +973,6 @@ $response = $client->deleteScript($params);
 ----
 /*
 $params['id']   = (string) The script ID (Required)
-       ['lang'] = (string) The script language (Required)
        ['body']  = (array) Request body
 */
 

src/Elasticsearch/Client.php

@@ -1204,7 +1204,6 @@ public function updateByQuery($params = array())
 
     /**
      * $params['id']   = (string) The script ID (Required)
-     *        ['lang'] = (string) The script language (Required)
      *
      * @param array $params Associative array of parameters
      *
@@ -1213,23 +1212,20 @@ public function updateByQuery($params = array())
     public function getScript($params)
     {
         $id = $this->extractArgument($params, 'id');
-        $lang = $this->extractArgument($params, 'lang');
 
         /** @var callable $endpointBuilder */
         $endpointBuilder = $this->endpoints;
 
         /** @var \Elasticsearch\Endpoints\Script\Get $endpoint */
         $endpoint = $endpointBuilder('Script\Get');
-        $endpoint->setID($id)
-                 ->setLang($lang);
+        $endpoint->setID($id);
         $endpoint->setParams($params);
 
         return $this->performRequest($endpoint);
     }
 
     /**
      * $params['id']   = (string) The script ID (Required)
-     *        ['lang'] = (string) The script language (Required)
      *
      * @param array $params Associative array of parameters
      *
@@ -1238,23 +1234,20 @@ public function getScript($params)
     public function deleteScript($params)
     {
         $id = $this->extractArgument($params, 'id');
-        $lang = $this->extractArgument($params, 'lang');
 
         /** @var callable $endpointBuilder */
         $endpointBuilder = $this->endpoints;
 
         /** @var \Elasticsearch\Endpoints\Script\Delete $endpoint */
         $endpoint = $endpointBuilder('Script\Delete');
-        $endpoint->setID($id)
-                 ->setLang($lang);
+        $endpoint->setID($id);
         $endpoint->setParams($params);
 
         return $this->performRequest($endpoint);
     }
 
     /**
      * $params['id']   = (string) The script ID (Required)
-     *        ['lang'] = (string) The script language (Required)
      *
      * @param array $params Associative array of parameters
      *
@@ -1263,7 +1256,6 @@ public function deleteScript($params)
     public function putScript($params)
     {
         $id   = $this->extractArgument($params, 'id');
-        $lang = $this->extractArgument($params, 'lang');
         $body = $this->extractArgument($params, 'body');
 
         /** @var callable $endpointBuilder */

src/Elasticsearch/Endpoints/Script/Delete.php

@@ -18,44 +18,19 @@
  */
 class Delete extends AbstractEndpoint
 {
-    /** @var string */
-    private $lang;
-
-    /**
-     * @param string $lang
-     *
-     * @return $this
-     */
-    public function setLang($lang)
-    {
-        if (isset($lang) !== true) {
-            return $this;
-        }
-
-        $this->lang = $lang;
-
-        return $this;
-    }
-
     /**
      * @throws \Elasticsearch\Common\Exceptions\RuntimeException
      * @return string
      */
     public function getURI()
     {
-        if (isset($this->lang) !== true) {
-            throw new Exceptions\RuntimeException(
-                'lang is required for Put'
-            );
-        }
         if (isset($this->id) !== true) {
             throw new Exceptions\RuntimeException(
                 'id is required for put'
             );
         }
         $id   = $this->id;
-        $lang = $this->lang;
-        $uri  = "/_scripts/$lang/$id";
+        $uri  = "/_scripts/$id";
 
         return $uri;
     }

src/Elasticsearch/Endpoints/Script/Get.php

@@ -18,44 +18,19 @@
  */
 class Get extends AbstractEndpoint
 {
-    /** @var string */
-    private $lang;
-
-    /**
-     * @param string $lang
-     *
-     * @return $this
-     */
-    public function setLang($lang)
-    {
-        if (isset($lang) !== true) {
-            return $this;
-        }
-
-        $this->lang = $lang;
-
-        return $this;
-    }
-
     /**
      * @throws \Elasticsearch\Common\Exceptions\RuntimeException
      * @return string
      */
     public function getURI()
     {
-        if (isset($this->lang) !== true) {
-            throw new Exceptions\RuntimeException(
-                'lang is required for Put'
-            );
-        }
         if (isset($this->id) !== true) {
             throw new Exceptions\RuntimeException(
                 'id is required for put'
             );
         }
         $id   = $this->id;
-        $lang = $this->lang;
-        $uri  = "/_scripts/$lang/$id";
+        $uri  = "/_scripts/$id";
 
         return $uri;
     }