[Rename] ElasticsearchWrapperException class in server module (#174)

This commit refactors the ElasticsearchWrapperException class in the server module to OpenSearchWrapperException. References and usages throughout the rest of the codebase are fully refactored. Signed-off-by: Nicholas Knize <[email protected]>
opensearch-project · Mar 22, 2021 · c42c210 · c42c210
1 parent e60906f
commit c42c210
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/server/src/main/java/org/elasticsearch/ExceptionsHelper.java b/server/src/main/java/org/elasticsearch/ExceptionsHelper.java
@@ -84,7 +84,7 @@ public static RestStatus status(Throwable t) {
     public static Throwable unwrapCause(Throwable t) {
         int counter = 0;
         Throwable result = t;
-        while (result instanceof ElasticsearchWrapperException) {
+        while (result instanceof OpenSearchWrapperException) {
             if (result.getCause() == null) {
                 return result;
             }

diff --git a/server/src/main/java/org/elasticsearch/OpenSearchException.java b/server/src/main/java/org/elasticsearch/OpenSearchException.java
@@ -232,7 +232,7 @@ public RestStatus status() {
 
     /**
      * Unwraps the actual cause from the exception for cases when the exception is a
-     * {@link ElasticsearchWrapperException}.
+     * {@link OpenSearchWrapperException}.
      *
      * @see ExceptionsHelper#unwrapCause(Throwable)
      */

diff --git a/...search/ElasticsearchWrapperException.java → ...ticsearch/OpenSearchWrapperException.java b/...search/ElasticsearchWrapperException.java → ...ticsearch/OpenSearchWrapperException.java
@@ -24,6 +24,6 @@
  * as an error because its is {@link #getCause() cause}, if non-null is
  * <strong>always</strong> more useful to the user than the exception itself.
  */
-public interface ElasticsearchWrapperException {
+public interface OpenSearchWrapperException {
     Throwable getCause();
 }
diff --git a/...va/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java b/...va/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.support.broadcast;
 
 import org.elasticsearch.OpenSearchException;
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.index.shard.ShardId;
 
@@ -31,7 +31,7 @@
  *
  *
  */
-public class BroadcastShardOperationFailedException extends OpenSearchException implements ElasticsearchWrapperException {
+public class BroadcastShardOperationFailedException extends OpenSearchException implements OpenSearchWrapperException {
 
     public BroadcastShardOperationFailedException(ShardId shardId, String msg) {
         this(shardId, msg, null);

diff --git a/server/src/main/java/org/elasticsearch/indices/IndexCreationException.java b/server/src/main/java/org/elasticsearch/indices/IndexCreationException.java
@@ -20,12 +20,12 @@
 package org.elasticsearch.indices;
 
 import org.elasticsearch.OpenSearchException;
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.common.io.stream.StreamInput;
 
 import java.io.IOException;
 
-public class IndexCreationException extends OpenSearchException implements ElasticsearchWrapperException {
+public class IndexCreationException extends OpenSearchException implements OpenSearchWrapperException {
 
     public IndexCreationException(String index, Throwable cause) {
         super("failed to create index [{}]", cause, index);

diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.indices.recovery;
 
 import org.elasticsearch.OpenSearchException;
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.ByteSizeValue;
@@ -29,7 +29,7 @@
 import java.io.IOException;
 import java.util.Objects;
 
-public class RecoverFilesRecoveryException extends OpenSearchException implements ElasticsearchWrapperException {
+public class RecoverFilesRecoveryException extends OpenSearchException implements OpenSearchWrapperException {
 
     private final int numberOfFiles;
 

diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestProcessorException.java b/server/src/main/java/org/elasticsearch/ingest/IngestProcessorException.java
@@ -20,16 +20,16 @@
 package org.elasticsearch.ingest;
 
 import org.elasticsearch.OpenSearchException;
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.common.io.stream.StreamInput;
 
 import java.io.IOException;
 
 /**
  * A dedicated wrapper for exceptions encountered executing an ingest processor. The wrapper is needed as we currently only unwrap causes
- * for instances of {@link ElasticsearchWrapperException}.
+ * for instances of {@link OpenSearchWrapperException}.
  */
-public class IngestProcessorException extends OpenSearchException implements ElasticsearchWrapperException {
+public class IngestProcessorException extends OpenSearchException implements OpenSearchWrapperException {
 
     IngestProcessorException(final Exception cause) {
         super(cause);

diff --git a/server/src/main/java/org/elasticsearch/search/SearchException.java b/server/src/main/java/org/elasticsearch/search/SearchException.java
@@ -20,13 +20,13 @@
 package org.elasticsearch.search;
 
 import org.elasticsearch.OpenSearchException;
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 
-public class SearchException extends OpenSearchException implements ElasticsearchWrapperException {
+public class SearchException extends OpenSearchException implements OpenSearchWrapperException {
 
     private final SearchShardTarget shardTarget;
 

diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java b/server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.transport;
 
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.transport.TransportAddress;
 
@@ -31,7 +31,7 @@
  *
  *
  */
-public class RemoteTransportException extends ActionTransportException implements ElasticsearchWrapperException {
+public class RemoteTransportException extends ActionTransportException implements OpenSearchWrapperException {
 
     public RemoteTransportException(String msg, Throwable cause) {
         super(msg, null, null, cause);

diff --git a/server/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java b/server/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.transport;
 
-import org.elasticsearch.ElasticsearchWrapperException;
+import org.elasticsearch.OpenSearchWrapperException;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.io.stream.StreamInput;
 
 import java.io.IOException;
 
-public class SendRequestTransportException extends ActionTransportException implements ElasticsearchWrapperException {
+public class SendRequestTransportException extends ActionTransportException implements OpenSearchWrapperException {
 
     public SendRequestTransportException(DiscoveryNode node, String action, Throwable cause) {
         super(node == null ? null : node.getName(), node == null ? null : node.getAddress(), action, cause);

diff --git a/server/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java
@@ -237,24 +237,24 @@ public void testErrorToAndFromXContent() throws IOException {
             case 3:
                 TransportAddress address = buildNewFakeTransportAddress();
                 original = new RemoteTransportException("remote", address, "action",
-                        new ResourceAlreadyExistsException("ElasticsearchWrapperException with a cause that has a custom status"));
+                        new ResourceAlreadyExistsException("OpenSearchWrapperException with a cause that has a custom status"));
                 status = RestStatus.BAD_REQUEST;
                 if (detailed) {
                     type = "resource_already_exists_exception";
-                    reason = "ElasticsearchWrapperException with a cause that has a custom status";
+                    reason = "OpenSearchWrapperException with a cause that has a custom status";
                 } else {
                     reason = "RemoteTransportException[[remote][" + address.toString() + "][action]]";
                 }
                 break;
             case 4:
-                original = new RemoteTransportException("ElasticsearchWrapperException with a cause that has a special treatment",
+                original = new RemoteTransportException("OpenSearchWrapperException with a cause that has a special treatment",
                         new IllegalArgumentException("wrong"));
                 status = RestStatus.BAD_REQUEST;
                 if (detailed) {
                     type = "illegal_argument_exception";
                     reason = "wrong";
                 } else {
-                    reason = "RemoteTransportException[[ElasticsearchWrapperException with a cause that has a special treatment]]";
+                    reason = "RemoteTransportException[[OpenSearchWrapperException with a cause that has a special treatment]]";
                 }
                 break;
             case 5: