From c42c2101a826ae001d24f3599637f9336cc7e9a0 Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Wed, 3 Mar 2021 19:23:00 -0600 Subject: [PATCH] [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 --- .../src/main/java/org/elasticsearch/ExceptionsHelper.java | 2 +- .../main/java/org/elasticsearch/OpenSearchException.java | 2 +- ...pperException.java => OpenSearchWrapperException.java} | 2 +- .../broadcast/BroadcastShardOperationFailedException.java | 4 ++-- .../org/elasticsearch/indices/IndexCreationException.java | 4 ++-- .../indices/recovery/RecoverFilesRecoveryException.java | 4 ++-- .../elasticsearch/ingest/IngestProcessorException.java | 6 +++--- .../java/org/elasticsearch/search/SearchException.java | 4 ++-- .../elasticsearch/transport/RemoteTransportException.java | 4 ++-- .../transport/SendRequestTransportException.java | 4 ++-- .../org/elasticsearch/rest/BytesRestResponseTests.java | 8 ++++---- 11 files changed, 22 insertions(+), 22 deletions(-) rename server/src/main/java/org/elasticsearch/{ElasticsearchWrapperException.java => OpenSearchWrapperException.java} (95%) diff --git a/server/src/main/java/org/elasticsearch/ExceptionsHelper.java b/server/src/main/java/org/elasticsearch/ExceptionsHelper.java index 65ce9cbcf0e51..99e4c43f71fe2 100644 --- 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 index d5f4784ac2c16..cadfe4872f296 100644 --- 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/server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java b/server/src/main/java/org/elasticsearch/OpenSearchWrapperException.java similarity index 95% rename from server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java rename to server/src/main/java/org/elasticsearch/OpenSearchWrapperException.java index 7e0fd3a24cb09..647f876cf0b48 100644 --- a/server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java +++ b/server/src/main/java/org/elasticsearch/OpenSearchWrapperException.java @@ -24,6 +24,6 @@ * as an error because its is {@link #getCause() cause}, if non-null is * always more useful to the user than the exception itself. */ -public interface ElasticsearchWrapperException { +public interface OpenSearchWrapperException { Throwable getCause(); } diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java index a2e445210d48a..557b2e60a25a0 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java +++ b/server/src/main/java/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 index c646eea2c23a3..897c226ff33b7 100644 --- 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 index 5e8cf7c087560..a09b2c6fac951 100644 --- 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 index 43a15e79e8a11..02f596b486e6e 100644 --- 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 index d733ab56b412f..c2998a85cd7fb 100644 --- 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 index 3111c8a4ec6b3..1fb91243fab07 100644 --- 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 index 08defb38f3b34..22aa51152639c 100644 --- 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 index 304f2b439cb1d..e11e264b4a18e 100644 --- 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: