honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] ElasticsearchGenerationException class in server module (#168) 

This commit refactors ElasticsearchGenerationException class in the server
module to OpenSearchGenerationException. References and usages throughout the
rest of the codebase are fully refactored.

Signed-off-by: Nicholas Knize <nknize@amazon.com>
This commit is contained in:
Nick Knize 2021-03-03 16:36:43 -06:00
parent 89e67c1646
commit ff9fd6c91f
17 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.indices;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.action.admin.indices.alias.Alias;
import org.elasticsearch.action.support.ActiveShardCount;
@ -175,7 +175,7 @@ public class CreateIndexRequest extends TimedRequest implements Validatable, ToX
builder.map(source);
return mapping(BytesReference.bytes(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}
@ -207,7 +207,7 @@ public class CreateIndexRequest extends TimedRequest implements Validatable, ToX
builder.map(source);
return aliases(BytesReference.bytes(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}

6
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutIndexTemplateRequest.java
View File

@ -18,7 +18,7 @@
*/
package org.elasticsearch.client.indices;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.IndicesRequest;
@ -262,7 +262,7 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
throw new UncheckedIOException("failed to convert source to json", e);
}
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}
@ -368,7 +368,7 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
builder.map(source);
return aliases(BytesReference.bytes(builder));
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}

4
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutMappingRequest.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.indices;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.action.IndicesRequest;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.TimedRequest;
@ -99,7 +99,7 @@ public class PutMappingRequest extends TimedRequest implements IndicesRequest, T
builder.map(mappingSource);
return source(builder);
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + mappingSource + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + mappingSource + "]", e);
}
}

12
server/src/main/java/org/elasticsearch/OpenSearchException.java
View File

@ -58,7 +58,7 @@ import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpect
import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureFieldName;
/**
* A base class for all elasticsearch exceptions.
* A base class for all opensearch exceptions.
*/
public class OpenSearchException extends RuntimeException implements ToXContentFragment, Writeable {
@ -282,15 +282,15 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
}
public static OpenSearchException readException(StreamInput input, int id) throws IOException {
CheckedFunction<StreamInput, ? extends OpenSearchException, IOException> elasticsearchException = ID_TO_SUPPLIER.get(id);
if (elasticsearchException == null) {
CheckedFunction<StreamInput, ? extends OpenSearchException, IOException> opensearchException = ID_TO_SUPPLIER.get(id);
if (opensearchException == null) {
if (id == 127 && input.getVersion().before(Version.V_7_5_0)) {
// was SearchContextException
return new SearchException(input);
}
throw new IllegalStateException("unknown exception for id: " + id);
}
return elasticsearchException.apply(input);
return opensearchException.apply(input);
}
/**
@ -774,8 +774,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
org.elasticsearch.ResourceNotFoundException::new, 19, UNKNOWN_VERSION_ADDED),
ACTION_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ActionTransportException.class,
org.elasticsearch.transport.ActionTransportException::new, 20, UNKNOWN_VERSION_ADDED),
ELASTICSEARCH_GENERATION_EXCEPTION(org.elasticsearch.ElasticsearchGenerationException.class,
org.elasticsearch.ElasticsearchGenerationException::new, 21, UNKNOWN_VERSION_ADDED),
ELASTICSEARCH_GENERATION_EXCEPTION(org.elasticsearch.OpenSearchGenerationException.class,
org.elasticsearch.OpenSearchGenerationException::new, 21, UNKNOWN_VERSION_ADDED),
// 22 was CreateFailedEngineException
INDEX_SHARD_STARTED_EXCEPTION(org.elasticsearch.index.shard.IndexShardStartedException.class,
org.elasticsearch.index.shard.IndexShardStartedException::new, 23, UNKNOWN_VERSION_ADDED),

8
server/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java → server/src/main/java/org/elasticsearch/OpenSearchGenerationException.java
View File

@ -28,17 +28,17 @@ import java.io.IOException;
*
*
*/
public class ElasticsearchGenerationException extends OpenSearchException {
public class OpenSearchGenerationException extends OpenSearchException {
public ElasticsearchGenerationException(String msg) {
public OpenSearchGenerationException(String msg) {
super(msg);
}
public ElasticsearchGenerationException(String msg, Throwable cause) {
public OpenSearchGenerationException(String msg, Throwable cause) {
super(msg, cause);
}
public ElasticsearchGenerationException(StreamInput in) throws IOException{
public OpenSearchGenerationException(StreamInput in) throws IOException{
super(in);
}
}

4
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.action.admin.cluster.snapshots.create;
import org.elasticsearch.OpenSearchException;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.IndicesRequest;
import org.elasticsearch.action.support.IndicesOptions;
@ -377,7 +377,7 @@ public class CreateSnapshotRequest extends MasterNodeRequest<CreateSnapshotReque
builder.map(source);
settings(Strings.toString(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
return this;
}

6
server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.alias;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.Version;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField;
@ -126,7 +126,7 @@ public class Alias implements Writeable, ToXContentFragment {
this.filter = Strings.toString(builder);
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + filter + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + filter + "]", e);
}
}
@ -145,7 +145,7 @@ public class Alias implements Writeable, ToXContentFragment {
this.filter = Strings.toString(builder);
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to build json for alias request", e);
throw new OpenSearchGenerationException("Failed to build json for alias request", e);
}
}

6
server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.alias;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.AliasesRequest;
@ -430,7 +430,7 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
this.filter = Strings.toString(builder);
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + filter + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + filter + "]", e);
}
}
@ -446,7 +446,7 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
this.filter = Strings.toString(builder);
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to build json for alias request", e);
throw new OpenSearchGenerationException("Failed to build json for alias request", e);
}
}

6
server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.create;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException;
@ -285,7 +285,7 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
mappings.put(type, Strings.toString(builder));
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}
@ -307,7 +307,7 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
builder.map(source);
return aliases(BytesReference.bytes(builder));
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}

4
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.action.admin.indices.mapping.put;
import com.carrotsearch.hppc.ObjectHashSet;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.IndicesRequest;
@ -304,7 +304,7 @@ public class PutMappingRequest extends AcknowledgedRequest<PutMappingRequest> im
builder.map(mappingSource);
return source(BytesReference.bytes(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + mappingSource + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + mappingSource + "]", e);
}
}

6
server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
View File

@ -18,7 +18,7 @@
*/
package org.elasticsearch.action.admin.indices.template.put;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException;
@ -297,7 +297,7 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
mappings.put(type, Strings.toString(builder));
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}
@ -421,7 +421,7 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
builder.map(source);
return aliases(BytesReference.bytes(builder));
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}

10
server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.action.index;
import org.apache.lucene.util.RamUsageEstimator;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.CompositeIndicesRequest;
@ -433,7 +433,7 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
*
* @param source The map to index
*/
public IndexRequest source(Map<String, ?> source) throws ElasticsearchGenerationException {
public IndexRequest source(Map<String, ?> source) throws OpenSearchGenerationException {
return source(source, Requests.INDEX_CONTENT_TYPE);
}
@ -442,13 +442,13 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
*
* @param source The map to index
*/
public IndexRequest source(Map<String, ?> source, XContentType contentType) throws ElasticsearchGenerationException {
public IndexRequest source(Map<String, ?> source, XContentType contentType) throws OpenSearchGenerationException {
try {
XContentBuilder builder = XContentFactory.contentBuilder(contentType);
builder.map(source);
return source(builder);
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
}
}
@ -506,7 +506,7 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
builder.endObject();
return source(builder);
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate", e);
throw new OpenSearchGenerationException("Failed to generate", e);
}
}

4
server/src/main/java/org/elasticsearch/cluster/metadata/AliasMetadata.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.metadata;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.AbstractDiffable;
import org.elasticsearch.cluster.Diff;
@ -299,7 +299,7 @@ public class AliasMetadata extends AbstractDiffable<AliasMetadata> implements To
this.filter = new CompressedXContent(BytesReference.bytes(builder));
return this;
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to build json for alias request", e);
throw new OpenSearchGenerationException("Failed to build json for alias request", e);
}
}

4
server/src/main/java/org/elasticsearch/common/settings/Settings.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.common.settings;
import org.apache.logging.log4j.Level;
import org.apache.lucene.util.SetOnce;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version;
import org.elasticsearch.common.Booleans;
@ -1060,7 +1060,7 @@ public final class Settings implements ToXContentFragment {
builder.map(map);
return loadFromSource(Strings.toString(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + map + "]", e);
throw new OpenSearchGenerationException("Failed to generate [" + map + "]", e);
}
}

4
server/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.util.concurrent;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import java.util.ArrayList;
import java.util.Collections;
@ -103,7 +103,7 @@ public class AtomicArray<E> {
*/
public E[] toArray(E[] a) {
if (a.length != array.length()) {
throw new ElasticsearchGenerationException("AtomicArrays can only be copied to arrays of the same size");
throw new OpenSearchGenerationException("AtomicArrays can only be copied to arrays of the same size");
}
for (int i = 0; i < array.length(); i++) {
a[i] = array.get(i);

4
server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
View File

@ -26,7 +26,7 @@ import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.ElasticsearchGenerationException;
import org.elasticsearch.OpenSearchGenerationException;
import org.elasticsearch.Version;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.compress.CompressedXContent;
@ -142,7 +142,7 @@ public class DocumentMapper implements ToXContentFragment {
try {
mappingSource = new CompressedXContent(this, XContentType.JSON, ToXContent.EMPTY_PARAMS);
} catch (Exception e) {
throw new ElasticsearchGenerationException("failed to serialize source for type [" + type + "]", e);
throw new OpenSearchGenerationException("failed to serialize source for type [" + type + "]", e);
}
final Collection<String> deleteTombstoneMetadataFields = Arrays.asList(VersionFieldMapper.NAME, IdFieldMapper.NAME,

2
server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
View File

@ -695,7 +695,7 @@ public class ExceptionSerializationTests extends ESTestCase {
ids.put(18, org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException.class);
ids.put(19, org.elasticsearch.ResourceNotFoundException.class);
ids.put(20, org.elasticsearch.transport.ActionTransportException.class);
ids.put(21, org.elasticsearch.ElasticsearchGenerationException.class);
ids.put(21, org.elasticsearch.OpenSearchGenerationException.class);
ids.put(22, null); // was CreateFailedEngineException
ids.put(23, org.elasticsearch.index.shard.IndexShardStartedException.class);
ids.put(24, org.elasticsearch.search.SearchContextMissingException.class);