Handle HTTP exceptions in HttpTransport

Signed-off-by: Kim Pepper <[email protected]>

Author: kimpepper

src/OpenSearch/Common/Exceptions/Forbidden403Exception.php

@@ -21,11 +21,15 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-@trigger_error(Forbidden403Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED);
+use OpenSearch\Exception\ForbiddenHttpException;
+
+@trigger_error(Forbidden403Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\ForbiddenHttpException instead', E_USER_DEPRECATED);
 
 /**
  * @deprecated in 2.3.2 and will be removed in 3.0.0.
+ *
+ * @see \OpenSearch\Exception\ForbiddenHttpException
  */
-class Forbidden403Exception extends \Exception implements OpenSearchException
+class Forbidden403Exception extends ForbiddenHttpException
 {
 }

src/OpenSearch/Common/Exceptions/Missing404Exception.php

@@ -21,11 +21,18 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-@trigger_error(Missing404Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED);
+use OpenSearch\Exception\NotFoundHttpException;
+
+@trigger_error(
+    Missing404Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NotFoundHttpException instead.',
+    E_USER_DEPRECATED
+);
 
 /**
  * @deprecated in 2.3.2 and will be removed in 3.0.0.
+ *
+ * @see \OpenSearch\Exception\NotFoundHttpException
  */
-class Missing404Exception extends \Exception implements OpenSearchException
+class Missing404Exception extends NotFoundHttpException
 {
 }

src/OpenSearch/Common/Exceptions/NoDocumentsToGetException.php

@@ -21,11 +21,16 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-@trigger_error(NoDocumentsToGetException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED);
+@trigger_error(
+    NoDocumentsToGetException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoDocumentsToGetException instead.',
+    E_USER_DEPRECATED
+);
 
 /**
- * @deprecated in 2.3.2 and will be removed in 3.0.0.
+ * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoDocumentsToGetException instead.
+ *
+ * @see \OpenSearch\Exception\ScriptLangNotSupportedException
  */
-class NoDocumentsToGetException extends ServerErrorResponseException implements OpenSearchException
+class NoDocumentsToGetException extends \OpenSearch\Exception\NoDocumentsToGetException
 {
 }

src/OpenSearch/Common/Exceptions/NoNodesAvailableException.php

@@ -21,6 +21,14 @@
 
 namespace OpenSearch\Common\Exceptions;
 
+@trigger_error(
+    NoNodesAvailableException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.',
+    E_USER_DEPRECATED
+);
+
+/**
+ * @deprecated in 2.3.2 and will be removed in 3.0.0.
+ */
 class NoNodesAvailableException extends ServerErrorResponseException implements OpenSearchException
 {
 }

src/OpenSearch/Common/Exceptions/NoShardAvailableException.php

@@ -21,6 +21,16 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-class NoShardAvailableException extends ServerErrorResponseException implements OpenSearchException
+@trigger_error(
+    NoShardAvailableException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoShardAvailableException instead.',
+    E_USER_DEPRECATED
+);
+
+/**
+ * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoShardAvailableException instead.
+ *
+ * @see \OpenSearch\Exception\NoShardAvailableException
+ */
+class NoShardAvailableException extends \OpenSearch\Exception\NoShardAvailableException
 {
 }

src/OpenSearch/Common/Exceptions/OpenSearchException.php

@@ -21,8 +21,16 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-use Throwable;
+use OpenSearch\Exception\OpenSearchExceptionInterface;
 
-interface OpenSearchException extends Throwable
+@trigger_error(
+    NoNodesAvailableException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.',
+    E_USER_DEPRECATED
+);
+
+/**
+ * @deprecated in 2.3.2 and will be removed in 3.0.0.
+ */
+interface OpenSearchException extends OpenSearchExceptionInterface
 {
 }

src/OpenSearch/Common/Exceptions/RoutingMissingException.php

@@ -21,6 +21,16 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-class RoutingMissingException extends ServerErrorResponseException implements OpenSearchException
+@trigger_error(
+    RoutingMissingException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\RoutingMissingException instead.',
+    E_USER_DEPRECATED
+);
+
+/**
+ * @deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead.
+ *
+ * @see \OpenSearch\Exception\ScriptLangNotSupportedException
+ */
+class RoutingMissingException extends \OpenSearch\Exception\RoutingMissingException
 {
 }

src/OpenSearch/Common/Exceptions/RuntimeException.php

@@ -21,6 +21,8 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-class RuntimeException extends \RuntimeException implements OpenSearchException
+use OpenSearch\Exception\OpenSearchExceptionInterface;
+
+class RuntimeException extends \RuntimeException implements OpenSearchExceptionInterface
 {
 }

src/OpenSearch/Common/Exceptions/ScriptLangNotSupportedException.php

@@ -21,6 +21,16 @@
 
 namespace OpenSearch\Common\Exceptions;
 
-class ScriptLangNotSupportedException extends BadRequest400Exception implements OpenSearchException
+@trigger_error(
+    ScriptLangNotSupportedException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\ScriptLangNotSupportedException instead.',
+    E_USER_DEPRECATED
+);
+
+/**
+ * @deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead.
+ *
+ * @see \OpenSearch\Exception\ScriptLangNotSupportedException
+ */
+class ScriptLangNotSupportedException extends \OpenSearch\Exception\ScriptLangNotSupportedException
 {
 }

src/OpenSearch/Common/Exceptions/ServerErrorResponseException.php

@@ -21,6 +21,11 @@
 
 namespace OpenSearch\Common\Exceptions;
 
+@trigger_error(RequestTimeout408Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED);
+
+/**
+ * @deprecated in 2.3.2 and will be removed in 3.0.0.
+ */
 class ServerErrorResponseException extends TransportException implements OpenSearchException
 {
 }