Skip to content

Commit a5d1cf3

Browse files
kaituokaituo
authored
Resolve Compiler and Test Failures in 2.x Branch Due to OpenSearch Core Refactoring (#946)
In this commit, several issues causing compiler and test failures in the 2.x branch are addressed. The failures were introduced due to various refactoring activities in OpenSearch core. The changes made include: - For the usages of Strings.isEmpty or Strings.isNullOrEmpty method, use org.opensearch.core.common.Strings. - For the usages of Strings.toString method, use org.opensearch.common.Strings. - Update references to getExceptionName method in OpenSearchException, which is now moved to the BaseExceptionsHelper class. - Create a new version of coalesceToEmpty in response to its removal from the Strings class. - Substitute ImmutableOpenMap with HashMap for more efficient data handling. Testing has been conducted by running a successful Gradle build. Signed-off-by: Kaituo Li <[email protected]>
1 parent dfb82ea commit a5d1cf3

36 files changed

+112
-108
lines changed

‎src/main/java/org/opensearch/ad/caching/PriorityCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
import org.opensearch.ad.settings.EnabledSetting;
5959
import org.opensearch.ad.util.DateUtils;
6060
import org.opensearch.cluster.service.ClusterService;
61-
import org.opensearch.common.Strings;
6261
import org.opensearch.common.settings.Setting;
6362
import org.opensearch.common.settings.Settings;
6463
import org.opensearch.common.unit.TimeValue;
64+
import org.opensearch.core.common.Strings;
6565
import org.opensearch.threadpool.ThreadPool;
6666

6767
import com.google.common.cache.Cache;

‎src/main/java/org/opensearch/ad/common/exception/NotSerializedADExceptionName.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
package org.opensearch.ad.common.exception;
1313

14+
import static org.opensearch.OpenSearchException.getExceptionName;
15+
1416
import java.util.Optional;
1517

1618
import org.apache.logging.log4j.LogManager;
1719
import org.apache.logging.log4j.Logger;
1820
import org.apache.logging.log4j.message.ParameterizedMessage;
19-
import org.opensearch.OpenSearchException;
2021
import org.opensearch.common.io.stream.NotSerializableExceptionWrapper;
2122

2223
/**
@@ -29,16 +30,16 @@
2930
*/
3031
public enum NotSerializedADExceptionName {
3132

32-
RESOURCE_NOT_FOUND_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new ResourceNotFoundException("", ""))),
33-
LIMIT_EXCEEDED_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new LimitExceededException("", "", false))),
34-
END_RUN_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new EndRunException("", "", false))),
35-
ANOMALY_DETECTION_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new AnomalyDetectionException("", ""))),
36-
INTERNAL_FAILURE_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new InternalFailure("", ""))),
37-
CLIENT_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new ClientException("", ""))),
38-
CANCELLATION_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new ADTaskCancelledException("", ""))),
39-
DUPLICATE_TASK_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new DuplicateTaskException(""))),
40-
AD_VERSION_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new ADVersionException(""))),
41-
AD_VALIDATION_EXCEPTION_NAME_UNDERSCORE(OpenSearchException.getExceptionName(new ADValidationException("", null, null)));
33+
RESOURCE_NOT_FOUND_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new ResourceNotFoundException("", ""))),
34+
LIMIT_EXCEEDED_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new LimitExceededException("", "", false))),
35+
END_RUN_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new EndRunException("", "", false))),
36+
ANOMALY_DETECTION_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new AnomalyDetectionException("", ""))),
37+
INTERNAL_FAILURE_NAME_UNDERSCORE(getExceptionName(new InternalFailure("", ""))),
38+
CLIENT_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new ClientException("", ""))),
39+
CANCELLATION_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new ADTaskCancelledException("", ""))),
40+
DUPLICATE_TASK_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new DuplicateTaskException(""))),
41+
AD_VERSION_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new ADVersionException(""))),
42+
AD_VALIDATION_EXCEPTION_NAME_UNDERSCORE(getExceptionName(new ADValidationException("", null, null)));
4243

4344
private static final Logger LOG = LogManager.getLogger(NotSerializedADExceptionName.class);
4445
private final String name;

‎src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.Arrays;
3131
import java.util.EnumMap;
3232
import java.util.HashSet;
33-
import java.util.Iterator;
3433
import java.util.LinkedHashMap;
3534
import java.util.List;
3635
import java.util.Map;
@@ -74,14 +73,14 @@
7473
import org.opensearch.cluster.metadata.AliasMetadata;
7574
import org.opensearch.cluster.metadata.IndexMetadata;
7675
import org.opensearch.cluster.service.ClusterService;
77-
import org.opensearch.common.Strings;
7876
import org.opensearch.common.bytes.BytesArray;
7977
import org.opensearch.common.settings.Settings;
8078
import org.opensearch.common.unit.TimeValue;
8179
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
8280
import org.opensearch.common.xcontent.XContentHelper;
8381
import org.opensearch.common.xcontent.XContentType;
8482
import org.opensearch.commons.InjectSecurity;
83+
import org.opensearch.core.common.Strings;
8584
import org.opensearch.core.xcontent.NamedXContentRegistry;
8685
import org.opensearch.core.xcontent.ToXContent;
8786
import org.opensearch.core.xcontent.XContentBuilder;
@@ -91,8 +90,6 @@
9190
import org.opensearch.threadpool.Scheduler;
9291
import org.opensearch.threadpool.ThreadPool;
9392

94-
import com.carrotsearch.hppc.cursors.ObjectCursor;
95-
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
9693
import com.google.common.base.Charsets;
9794
import com.google.common.io.Resources;
9895

@@ -759,8 +756,7 @@ void deleteOldHistoryIndices() {
759756
adminClient.cluster().state(clusterStateRequest, ActionListener.wrap(clusterStateResponse -> {
760757
String latestToDelete = null;
761758
long latest = Long.MIN_VALUE;
762-
for (ObjectCursor<IndexMetadata> cursor : clusterStateResponse.getState().metadata().indices().values()) {
763-
IndexMetadata indexMetaData = cursor.value;
759+
for (IndexMetadata indexMetaData : clusterStateResponse.getState().metadata().indices().values()) {
764760
long creationTime = indexMetaData.getCreationDate();
765761

766762
if ((Instant.now().toEpochMilli() - creationTime) > historyRetentionPeriod.millis()) {
@@ -986,10 +982,10 @@ private void shouldUpdateIndex(ADIndex index, ActionListener<Boolean> thenDo) {
986982
.indicesOptions(IndicesOptions.lenientExpandOpenHidden());
987983
adminClient.indices().getAliases(getAliasRequest, ActionListener.wrap(getAliasResponse -> {
988984
String concreteIndex = null;
989-
for (ObjectObjectCursor<String, List<AliasMetadata>> entry : getAliasResponse.getAliases()) {
990-
if (false == entry.value.isEmpty()) {
985+
for (Map.Entry<String, List<AliasMetadata>> entry : getAliasResponse.getAliases().entrySet()) {
986+
if (false == entry.getValue().isEmpty()) {
991987
// we assume the alias map to one concrete index, thus we can return after finding one
992-
concreteIndex = entry.key;
988+
concreteIndex = entry.getKey();
993989
break;
994990
}
995991
}
@@ -1137,9 +1133,7 @@ private void updateJobIndexSettingIfNecessary(IndexState jobIndexState, ActionLi
11371133

11381134
private static Integer getIntegerSetting(GetSettingsResponse settingsResponse, String settingKey) {
11391135
Integer value = null;
1140-
Iterator<Settings> iter = settingsResponse.getIndexToSettings().valuesIt();
1141-
while (iter.hasNext()) {
1142-
Settings settings = iter.next();
1136+
for (Settings settings : settingsResponse.getIndexToSettings().values()) {
11431137
value = settings.getAsInt(settingKey, null);
11441138
if (value != null) {
11451139
break;
@@ -1150,9 +1144,7 @@ private static Integer getIntegerSetting(GetSettingsResponse settingsResponse, S
11501144

11511145
private static String getStringSetting(GetSettingsResponse settingsResponse, String settingKey) {
11521146
String value = null;
1153-
Iterator<Settings> iter = settingsResponse.getIndexToSettings().valuesIt();
1154-
while (iter.hasNext()) {
1155-
Settings settings = iter.next();
1147+
for (Settings settings : settingsResponse.getIndexToSettings().values()) {
11561148
value = settings.get(settingKey, null);
11571149
if (value != null) {
11581150
break;

‎src/main/java/org/opensearch/ad/model/AnomalyDetectorExecutionInput.java

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

1919
import org.opensearch.ad.annotation.Generated;
2020
import org.opensearch.ad.util.ParseUtils;
21-
import org.opensearch.common.Strings;
21+
import org.opensearch.core.common.Strings;
2222
import org.opensearch.core.xcontent.ToXContentObject;
2323
import org.opensearch.core.xcontent.XContentBuilder;
2424
import org.opensearch.core.xcontent.XContentParser;

‎src/main/java/org/opensearch/ad/ratelimit/CheckPointMaintainRequestAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import org.opensearch.ad.ml.ModelState;
2828
import org.opensearch.ad.util.DateUtils;
2929
import org.opensearch.cluster.service.ClusterService;
30-
import org.opensearch.common.Strings;
3130
import org.opensearch.common.settings.Setting;
3231
import org.opensearch.common.settings.Settings;
3332
import org.opensearch.common.unit.TimeValue;
33+
import org.opensearch.core.common.Strings;
3434

3535
public class CheckPointMaintainRequestAdapter {
3636
private static final Logger LOG = LogManager.getLogger(CheckPointMaintainRequestAdapter.class);

‎src/main/java/org/opensearch/ad/ratelimit/CheckpointWriteWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import org.opensearch.ad.model.AnomalyDetector;
4040
import org.opensearch.ad.util.ExceptionUtil;
4141
import org.opensearch.cluster.service.ClusterService;
42-
import org.opensearch.common.Strings;
4342
import org.opensearch.common.settings.Setting;
4443
import org.opensearch.common.settings.Settings;
44+
import org.opensearch.core.common.Strings;
4545
import org.opensearch.threadpool.ThreadPool;
4646

4747
public class CheckpointWriteWorker extends BatchWorker<CheckpointWriteRequest, BulkRequest, BulkResponse> {

‎src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.opensearch.ad.transport.GetAnomalyDetectorAction;
3131
import org.opensearch.ad.transport.GetAnomalyDetectorRequest;
3232
import org.opensearch.client.node.NodeClient;
33-
import org.opensearch.common.Strings;
33+
import org.opensearch.core.common.Strings;
3434
import org.opensearch.rest.BaseRestHandler;
3535
import org.opensearch.rest.RestRequest;
3636
import org.opensearch.rest.action.RestActions;

‎src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.opensearch.ad.transport.PreviewAnomalyDetectorAction;
2929
import org.opensearch.ad.transport.PreviewAnomalyDetectorRequest;
3030
import org.opensearch.ad.util.RestHandlerUtils;
31-
import org.opensearch.common.Strings;
31+
import org.opensearch.core.common.Strings;
3232
import org.opensearch.core.xcontent.XContentParser;
3333
import org.opensearch.rest.BaseRestHandler;
3434
import org.opensearch.rest.BytesRestResponse;

‎src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.opensearch.client.node.NodeClient;
3030
import org.opensearch.cluster.node.DiscoveryNode;
3131
import org.opensearch.cluster.service.ClusterService;
32-
import org.opensearch.common.Strings;
32+
import org.opensearch.core.common.Strings;
3333
import org.opensearch.rest.BaseRestHandler;
3434
import org.opensearch.rest.RestRequest;
3535
import org.opensearch.rest.action.RestToXContentListener;

‎src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.action.ActionRequestValidationException;
2020
import org.opensearch.ad.model.ADTask;
2121
import org.opensearch.ad.model.AnomalyDetector;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.io.stream.StreamInput;
2423
import org.opensearch.common.io.stream.StreamOutput;
24+
import org.opensearch.core.common.Strings;
2525

2626
public class ADBatchAnomalyResultRequest extends ActionRequest {
2727
private ADTask adTask;

‎src/main/java/org/opensearch/ad/transport/ADCancelTaskRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.action.support.nodes.BaseNodesRequest;
2020
import org.opensearch.ad.constant.CommonErrorMessages;
2121
import org.opensearch.cluster.node.DiscoveryNode;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.io.stream.StreamInput;
2423
import org.opensearch.common.io.stream.StreamOutput;
24+
import org.opensearch.core.common.Strings;
2525

2626
public class ADCancelTaskRequest extends BaseNodesRequest<ADCancelTaskRequest> {
2727

‎src/main/java/org/opensearch/ad/transport/ADTaskProfileRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.action.support.nodes.BaseNodesRequest;
2020
import org.opensearch.ad.constant.CommonErrorMessages;
2121
import org.opensearch.cluster.node.DiscoveryNode;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.io.stream.StreamInput;
2423
import org.opensearch.common.io.stream.StreamOutput;
24+
import org.opensearch.core.common.Strings;
2525

2626
public class ADTaskProfileRequest extends BaseNodesRequest<ADTaskProfileRequest> {
2727

‎src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import org.opensearch.action.ActionRequestValidationException;
2323
import org.opensearch.ad.constant.CommonErrorMessages;
2424
import org.opensearch.ad.constant.CommonName;
25-
import org.opensearch.common.Strings;
2625
import org.opensearch.common.io.stream.InputStreamStreamInput;
2726
import org.opensearch.common.io.stream.OutputStreamStreamOutput;
2827
import org.opensearch.common.io.stream.StreamInput;
2928
import org.opensearch.common.io.stream.StreamOutput;
29+
import org.opensearch.core.common.Strings;
3030
import org.opensearch.core.xcontent.ToXContentObject;
3131
import org.opensearch.core.xcontent.XContentBuilder;
3232

‎src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import org.opensearch.action.ActionRequest;
1919
import org.opensearch.action.ActionRequestValidationException;
2020
import org.opensearch.ad.constant.CommonErrorMessages;
21-
import org.opensearch.common.Strings;
2221
import org.opensearch.common.io.stream.StreamInput;
2322
import org.opensearch.common.io.stream.StreamOutput;
23+
import org.opensearch.core.common.Strings;
2424

2525
public class DeleteAnomalyDetectorRequest extends ActionRequest {
2626

‎src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.opensearch.ad.constant.CommonErrorMessages;
2121
import org.opensearch.ad.constant.CommonName;
2222
import org.opensearch.cluster.node.DiscoveryNode;
23-
import org.opensearch.common.Strings;
2423
import org.opensearch.common.io.stream.StreamInput;
2524
import org.opensearch.common.io.stream.StreamOutput;
25+
import org.opensearch.core.common.Strings;
2626
import org.opensearch.core.xcontent.ToXContentObject;
2727
import org.opensearch.core.xcontent.XContentBuilder;
2828

‎src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.opensearch.ad.model.Entity;
2525
import org.opensearch.ad.model.EntityProfileName;
2626
import org.opensearch.ad.util.Bwc;
27-
import org.opensearch.common.Strings;
2827
import org.opensearch.common.io.stream.StreamInput;
2928
import org.opensearch.common.io.stream.StreamOutput;
29+
import org.opensearch.core.common.Strings;
3030
import org.opensearch.core.xcontent.ToXContentObject;
3131
import org.opensearch.core.xcontent.XContentBuilder;
3232

‎src/main/java/org/opensearch/ad/transport/EntityResultRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.opensearch.ad.constant.CommonName;
2727
import org.opensearch.ad.model.Entity;
2828
import org.opensearch.ad.util.Bwc;
29-
import org.opensearch.common.Strings;
3029
import org.opensearch.common.io.stream.StreamInput;
3130
import org.opensearch.common.io.stream.StreamOutput;
31+
import org.opensearch.core.common.Strings;
3232
import org.opensearch.core.xcontent.ToXContentObject;
3333
import org.opensearch.core.xcontent.XContentBuilder;
3434

‎src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
import org.opensearch.client.Client;
6363
import org.opensearch.cluster.service.ClusterService;
6464
import org.opensearch.common.CheckedConsumer;
65-
import org.opensearch.common.Strings;
6665
import org.opensearch.common.inject.Inject;
6766
import org.opensearch.common.settings.Settings;
6867
import org.opensearch.common.util.concurrent.ThreadContext;
6968
import org.opensearch.commons.authuser.User;
69+
import org.opensearch.core.common.Strings;
7070
import org.opensearch.core.xcontent.NamedXContentRegistry;
7171
import org.opensearch.core.xcontent.XContentParser;
7272
import org.opensearch.rest.RestStatus;

‎src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.action.ActionRequestValidationException;
2020
import org.opensearch.ad.constant.CommonErrorMessages;
2121
import org.opensearch.ad.constant.CommonName;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.io.stream.StreamInput;
2423
import org.opensearch.common.io.stream.StreamOutput;
24+
import org.opensearch.core.common.Strings;
2525
import org.opensearch.core.xcontent.ToXContentObject;
2626
import org.opensearch.core.xcontent.XContentBuilder;
2727

‎src/main/java/org/opensearch/ad/transport/RCFResultRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.action.ActionRequestValidationException;
2020
import org.opensearch.ad.constant.CommonErrorMessages;
2121
import org.opensearch.ad.constant.CommonName;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.io.stream.StreamInput;
2423
import org.opensearch.common.io.stream.StreamOutput;
24+
import org.opensearch.core.common.Strings;
2525
import org.opensearch.core.xcontent.ToXContentObject;
2626
import org.opensearch.core.xcontent.XContentBuilder;
2727

‎src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
import org.opensearch.ad.model.AnomalyResultBucket;
4040
import org.opensearch.ad.transport.handler.ADSearchHandler;
4141
import org.opensearch.client.Client;
42-
import org.opensearch.common.Strings;
4342
import org.opensearch.common.inject.Inject;
43+
import org.opensearch.core.common.Strings;
4444
import org.opensearch.index.query.BoolQueryBuilder;
4545
import org.opensearch.index.query.ExistsQueryBuilder;
4646
import org.opensearch.index.query.QueryBuilder;

‎src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.opensearch.action.ActionRequestValidationException;
2222
import org.opensearch.ad.constant.CommonErrorMessages;
2323
import org.opensearch.ad.constant.CommonName;
24-
import org.opensearch.common.Strings;
2524
import org.opensearch.common.io.stream.InputStreamStreamInput;
2625
import org.opensearch.common.io.stream.OutputStreamStreamOutput;
2726
import org.opensearch.common.io.stream.StreamInput;
2827
import org.opensearch.common.io.stream.StreamOutput;
28+
import org.opensearch.core.common.Strings;
2929
import org.opensearch.core.xcontent.ToXContentObject;
3030
import org.opensearch.core.xcontent.XContentBuilder;
3131

‎src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.action.ActionRequestValidationException;
2020
import org.opensearch.ad.constant.CommonErrorMessages;
2121
import org.opensearch.ad.constant.CommonName;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.io.stream.StreamInput;
2423
import org.opensearch.common.io.stream.StreamOutput;
24+
import org.opensearch.core.common.Strings;
2525
import org.opensearch.core.xcontent.ToXContentObject;
2626
import org.opensearch.core.xcontent.XContentBuilder;
2727

‎src/main/java/org/opensearch/ad/util/ADSafeSecurityInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import org.opensearch.ad.NodeStateManager;
2020
import org.opensearch.ad.common.exception.EndRunException;
2121
import org.opensearch.ad.model.AnomalyDetector;
22-
import org.opensearch.common.Strings;
2322
import org.opensearch.common.settings.Settings;
2423
import org.opensearch.common.util.concurrent.ThreadContext;
2524
import org.opensearch.commons.authuser.User;
25+
import org.opensearch.core.common.Strings;
2626

2727
public class ADSafeSecurityInjector extends SafeSecurityInjector {
2828
private static final Logger LOG = LogManager.getLogger(ADSafeSecurityInjector.class);

‎src/main/java/org/opensearch/ad/util/RestHandlerUtils.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.opensearch.ad.constant.CommonErrorMessages;
3232
import org.opensearch.ad.model.AnomalyDetector;
3333
import org.opensearch.ad.model.Feature;
34+
import org.opensearch.common.Nullable;
3435
import org.opensearch.common.Strings;
3536
import org.opensearch.common.bytes.BytesReference;
3637
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
@@ -96,7 +97,7 @@ private RestHandlerUtils() {}
9697
* @return instance of {@link org.opensearch.search.fetch.subphase.FetchSourceContext}
9798
*/
9899
public static FetchSourceContext getSourceContext(RestRequest request, SearchSourceBuilder searchSourceBuilder) {
99-
String userAgent = Strings.coalesceToEmpty(request.header("User-Agent"));
100+
String userAgent = coalesceToEmpty(request.header("User-Agent"));
100101

101102
// If there is a _source given in request than we either add UI_Metadata to exclude or not depending on if request
102103
// is from OpenSearch-Dashboards, if no _source field then we either exclude UI_metadata or return nothing at all.
@@ -238,4 +239,8 @@ public static boolean isProperExceptionToReturn(Throwable e) {
238239
}
239240
return e instanceof OpenSearchStatusException || e instanceof IndexNotFoundException || e instanceof InvalidIndexNameException;
240241
}
242+
243+
private static String coalesceToEmpty(@Nullable String s) {
244+
return s == null ? "" : s;
245+
}
241246
}

‎src/test/java/org/opensearch/EntityProfileRequest1_0.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.opensearch.ad.constant.CommonErrorMessages;
2323
import org.opensearch.ad.constant.CommonName;
2424
import org.opensearch.ad.model.EntityProfileName;
25-
import org.opensearch.common.Strings;
2625
import org.opensearch.common.io.stream.StreamInput;
2726
import org.opensearch.common.io.stream.StreamOutput;
27+
import org.opensearch.core.common.Strings;
2828
import org.opensearch.core.xcontent.ToXContentObject;
2929
import org.opensearch.core.xcontent.XContentBuilder;
3030

0 commit comments

Comments
 (0)