Skip to content

Commit 06b463d

Browse files
committed
[Refactor] OpenSearchException and ExceptionsHelper foundation to base class
Creates new BaseOpenSearchException and BaseExceptionsHelper in core library as a step to moving OpenSearch exception mechanisms from the server module to core library. This is a move to support serverless and cloud native capabilities without requiring the server module for core opensearch indexing, search, and compute capabilities. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
1 parent d9f840f commit 06b463d

File tree

419 files changed

+1817
-1484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+1817
-1484
lines changed

client/rest-high-level/src/main/java/org/opensearch/client/ClusterRequestConverters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.opensearch.client.indices.DeleteComponentTemplateRequest;
4646
import org.opensearch.client.indices.GetComponentTemplatesRequest;
4747
import org.opensearch.client.indices.PutComponentTemplateRequest;
48-
import org.opensearch.common.Strings;
48+
import org.opensearch.core.common.Strings;
4949

5050
import java.io.IOException;
5151

client/rest-high-level/src/main/java/org/opensearch/client/IndicesRequestConverters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import org.opensearch.client.indices.SimulateIndexTemplateRequest;
7474
import org.opensearch.client.indices.rollover.RolloverRequest;
7575
import org.opensearch.cluster.metadata.IndexMetadata;
76-
import org.opensearch.common.Strings;
76+
import org.opensearch.core.common.Strings;
7777

7878
import java.io.IOException;
7979
import java.util.Locale;

client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@
7272
import org.opensearch.cluster.health.ClusterHealthStatus;
7373
import org.opensearch.common.Nullable;
7474
import org.opensearch.common.Priority;
75-
import org.opensearch.common.Strings;
7675
import org.opensearch.common.SuppressForbidden;
7776
import org.opensearch.common.bytes.BytesReference;
7877
import org.opensearch.common.lucene.uid.Versions;
7978
import org.opensearch.common.unit.TimeValue;
8079
import org.opensearch.common.util.CollectionUtils;
8180
import org.opensearch.common.xcontent.XContentHelper;
8281
import org.opensearch.common.xcontent.XContentType;
82+
import org.opensearch.core.common.Strings;
8383
import org.opensearch.core.xcontent.DeprecationHandler;
8484
import org.opensearch.core.xcontent.NamedXContentRegistry;
8585
import org.opensearch.core.xcontent.ToXContent;
@@ -220,7 +220,7 @@ static Request bulk(BulkRequest bulkRequest) throws IOException {
220220

221221
if (opType == DocWriteRequest.OpType.INDEX || opType == DocWriteRequest.OpType.CREATE) {
222222
IndexRequest indexRequest = (IndexRequest) action;
223-
if (Strings.hasLength(indexRequest.getPipeline())) {
223+
if (org.opensearch.core.common.Strings.hasLength(indexRequest.getPipeline())) {
224224
metadata.field("pipeline", indexRequest.getPipeline());
225225
}
226226
} else if (opType == DocWriteRequest.OpType.UPDATE) {
@@ -338,7 +338,7 @@ static Request multiGet(MultiGetRequest multiGetRequest) throws IOException {
338338
}
339339

340340
static Request index(IndexRequest indexRequest) {
341-
String method = Strings.hasLength(indexRequest.id()) ? HttpPut.METHOD_NAME : HttpPost.METHOD_NAME;
341+
String method = org.opensearch.core.common.Strings.hasLength(indexRequest.id()) ? HttpPut.METHOD_NAME : HttpPost.METHOD_NAME;
342342

343343
String endpoint;
344344
if (indexRequest.opType() == DocWriteRequest.OpType.CREATE) {
@@ -747,7 +747,7 @@ static Request putScript(PutStoredScriptRequest putStoredScriptRequest) throws I
747747
Params params = new Params();
748748
params.withTimeout(putStoredScriptRequest.timeout());
749749
params.withClusterManagerTimeout(putStoredScriptRequest.clusterManagerNodeTimeout());
750-
if (Strings.hasText(putStoredScriptRequest.context())) {
750+
if (org.opensearch.core.common.Strings.hasText(putStoredScriptRequest.context())) {
751751
params.putParam("context", putStoredScriptRequest.context());
752752
}
753753
request.addParameters(params.asMap());
@@ -903,7 +903,7 @@ static class Params {
903903
Params() {}
904904

905905
Params putParam(String name, String value) {
906-
if (Strings.hasLength(value)) {
906+
if (org.opensearch.core.common.Strings.hasLength(value)) {
907907
parameters.put(name, value);
908908
}
909909
return this;
@@ -1298,7 +1298,7 @@ static class EndpointBuilder {
12981298

12991299
EndpointBuilder addPathPart(String... parts) {
13001300
for (String part : parts) {
1301-
if (Strings.hasLength(part)) {
1301+
if (org.opensearch.core.common.Strings.hasLength(part)) {
13021302
joiner.add(encodePart(part));
13031303
}
13041304
}
@@ -1317,7 +1317,7 @@ EndpointBuilder addCommaSeparatedPathParts(List<String> parts) {
13171317

13181318
EndpointBuilder addPathPartAsIs(String... parts) {
13191319
for (String part : parts) {
1320-
if (Strings.hasLength(part)) {
1320+
if (org.opensearch.core.common.Strings.hasLength(part)) {
13211321
joiner.add(part);
13221322
}
13231323
}

client/rest-high-level/src/main/java/org/opensearch/client/SnapshotRequestConverters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
4848
import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
4949
import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest;
50-
import org.opensearch.common.Strings;
50+
import org.opensearch.core.common.Strings;
5151

5252
import java.io.IOException;
5353

client/rest-high-level/src/main/java/org/opensearch/client/core/CountRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.opensearch.action.ActionRequestValidationException;
3737
import org.opensearch.action.IndicesRequest;
3838
import org.opensearch.action.support.IndicesOptions;
39-
import org.opensearch.common.Strings;
39+
import org.opensearch.core.common.Strings;
4040
import org.opensearch.core.xcontent.ToXContentObject;
4141
import org.opensearch.core.xcontent.XContentBuilder;
4242
import org.opensearch.index.query.QueryBuilder;

client/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
package org.opensearch.client.indices;
3434

35+
import org.opensearch.core.common.Strings;
3536
import org.opensearch.core.ParseField;
36-
import org.opensearch.common.Strings;
3737
import org.opensearch.core.xcontent.ConstructingObjectParser;
3838
import org.opensearch.core.xcontent.XContentParser;
3939

client/rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import org.opensearch.action.support.IndicesOptions;
3636
import org.opensearch.client.Validatable;
37-
import org.opensearch.common.Strings;
37+
import org.opensearch.core.common.Strings;
3838

3939
/** Request the mappings of specific fields */
4040
public class GetFieldMappingsRequest implements Validatable {

client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.opensearch.client.TimedRequest;
3636
import org.opensearch.client.Validatable;
3737
import org.opensearch.common.Nullable;
38-
import org.opensearch.common.Strings;
3938
import org.opensearch.common.unit.TimeValue;
39+
import org.opensearch.core.common.Strings;
4040

4141
import java.util.Arrays;
4242
import java.util.List;

client/rest-high-level/src/main/java/org/opensearch/client/indices/GetMappingsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import org.opensearch.action.support.IndicesOptions;
3636
import org.opensearch.client.TimedRequest;
37-
import org.opensearch.common.Strings;
37+
import org.opensearch.core.common.Strings;
3838

3939
public class GetMappingsRequest extends TimedRequest {
4040

client/rest-high-level/src/main/resources/forbidden/rest-high-level-signatures.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ org.apache.hc.core5.http.ContentType#create(java.lang.String,java.nio.charset.Ch
2222
@defaultMessage ES's logging infrastructure uses log4j2 which we don't want to force on high level rest client users
2323
org.opensearch.common.logging.DeprecationLogger
2424
org.opensearch.common.logging.LogConfigurator
25-
org.opensearch.common.logging.LoggerMessageFormat
25+
org.opensearch.core.common.logging.LoggerMessageFormat
2626
org.opensearch.common.logging.Loggers
2727
org.opensearch.common.logging.NodeNamePatternConverter
2828
org.opensearch.common.logging.PrefixLogger

0 commit comments

Comments
 (0)