Skip to content

Commit f60d9cf

Browse files
kaituokaituo
committed
name change and delete files
Signed-off-by: Kaituo Li <[email protected]>
1 parent f71af09 commit f60d9cf

33 files changed

+98
-385
lines changed

‎src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
import org.opensearch.ad.rest.RestSearchTopAnomalyResultAction;
7676
import org.opensearch.ad.rest.RestStatsAnomalyDetectorAction;
7777
import org.opensearch.ad.rest.RestValidateAnomalyDetectorAction;
78+
import org.opensearch.ad.settings.ADEnabledSetting;
79+
import org.opensearch.ad.settings.ADNumericSetting;
7880
import org.opensearch.ad.settings.AnomalyDetectorSettings;
79-
import org.opensearch.ad.settings.EnabledSetting;
8081
import org.opensearch.ad.settings.LegacyOpenDistroAnomalyDetectorSettings;
81-
import org.opensearch.ad.settings.NumericSetting;
8282
import org.opensearch.ad.stats.ADStat;
8383
import org.opensearch.ad.stats.ADStats;
8484
import org.opensearch.ad.stats.suppliers.CounterSupplier;
@@ -323,8 +323,8 @@ public Collection<Object> createComponents(
323323
IndexNameExpressionResolver indexNameExpressionResolver,
324324
Supplier<RepositoriesService> repositoriesServiceSupplier
325325
) {
326-
EnabledSetting.getInstance().init(clusterService);
327-
NumericSetting.getInstance().init(clusterService);
326+
ADEnabledSetting.getInstance().init(clusterService);
327+
ADNumericSetting.getInstance().init(clusterService);
328328
this.client = client;
329329
this.threadPool = threadPool;
330330
Settings settings = environment.settings();
@@ -847,8 +847,8 @@ public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) {
847847

848848
@Override
849849
public List<Setting<?>> getSettings() {
850-
List<Setting<?>> enabledSetting = EnabledSetting.getInstance().getSettings();
851-
List<Setting<?>> numericSetting = NumericSetting.getInstance().getSettings();
850+
List<Setting<?>> enabledSetting = ADEnabledSetting.getInstance().getSettings();
851+
List<Setting<?>> numericSetting = ADNumericSetting.getInstance().getSettings();
852852

853853
List<Setting<?>> systemSetting = ImmutableList
854854
.of(

‎src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import org.opensearch.ad.model.DetectorState;
4444
import org.opensearch.ad.model.InitProgressProfile;
4545
import org.opensearch.ad.model.IntervalTimeConfiguration;
46+
import org.opensearch.ad.settings.ADNumericSetting;
4647
import org.opensearch.ad.settings.AnomalyDetectorSettings;
47-
import org.opensearch.ad.settings.NumericSetting;
4848
import org.opensearch.ad.task.ADTaskManager;
4949
import org.opensearch.ad.transport.ProfileAction;
5050
import org.opensearch.ad.transport.ProfileRequest;
@@ -285,7 +285,7 @@ private void prepareProfile(
285285

286286
private void profileEntityStats(MultiResponsesDelegateActionListener<DetectorProfile> listener, AnomalyDetector detector) {
287287
List<String> categoryField = detector.getCategoryField();
288-
if (!detector.isMultientityDetector() || categoryField.size() > NumericSetting.maxCategoricalFields()) {
288+
if (!detector.isMultientityDetector() || categoryField.size() > ADNumericSetting.maxCategoricalFields()) {
289289
listener.onResponse(new DetectorProfile.Builder().build());
290290
} else {
291291
if (categoryField.size() == 1) {

‎src/main/java/org/opensearch/ad/EntityProfileRunner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.opensearch.ad.model.EntityState;
3737
import org.opensearch.ad.model.InitProgressProfile;
3838
import org.opensearch.ad.model.IntervalTimeConfiguration;
39-
import org.opensearch.ad.settings.NumericSetting;
39+
import org.opensearch.ad.settings.ADNumericSetting;
4040
import org.opensearch.ad.transport.EntityProfileAction;
4141
import org.opensearch.ad.transport.EntityProfileRequest;
4242
import org.opensearch.ad.transport.EntityProfileResponse;
@@ -106,7 +106,7 @@ public void profile(
106106
ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
107107
AnomalyDetector detector = AnomalyDetector.parse(parser, detectorId);
108108
List<String> categoryFields = detector.getCategoryField();
109-
int maxCategoryFields = NumericSetting.maxCategoricalFields();
109+
int maxCategoryFields = ADNumericSetting.maxCategoricalFields();
110110
if (categoryFields == null || categoryFields.size() == 0) {
111111
listener.onFailure(new IllegalArgumentException(NOT_HC_DETECTOR_ERR_MSG));
112112
} else if (categoryFields.size() > maxCategoryFields) {

‎src/main/java/org/opensearch/ad/breaker/ADCircuitBreakerService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import org.apache.logging.log4j.LogManager;
1818
import org.apache.logging.log4j.Logger;
19-
import org.opensearch.ad.settings.EnabledSetting;
19+
import org.opensearch.ad.settings.ADEnabledSetting;
2020
import org.opensearch.monitor.jvm.JvmService;
2121

2222
/**
@@ -76,7 +76,7 @@ public ADCircuitBreakerService init() {
7676
}
7777

7878
public Boolean isOpen() {
79-
if (!EnabledSetting.isADBreakerEnabled()) {
79+
if (!ADEnabledSetting.isADBreakerEnabled()) {
8080
return false;
8181
}
8282

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import org.opensearch.ad.model.ModelProfile;
5454
import org.opensearch.ad.ratelimit.CheckpointMaintainWorker;
5555
import org.opensearch.ad.ratelimit.CheckpointWriteWorker;
56-
import org.opensearch.ad.settings.EnabledSetting;
56+
import org.opensearch.ad.settings.ADEnabledSetting;
5757
import org.opensearch.ad.util.DateUtils;
5858
import org.opensearch.cluster.service.ClusterService;
5959
import org.opensearch.common.settings.Setting;
@@ -162,15 +162,15 @@ public ModelState<EntityModel> get(String modelId, AnomalyDetector detector) {
162162

163163
// during maintenance period, stop putting new entries
164164
if (!maintenanceLock.isLocked() && modelState == null) {
165-
if (EnabledSetting.isDoorKeeperInCacheEnabled()) {
165+
if (ADEnabledSetting.isDoorKeeperInCacheEnabled()) {
166166
DoorKeeper doorKeeper = doorKeepers
167167
.computeIfAbsent(
168168
detectorId,
169169
id -> {
170170
// reset every 60 intervals
171171
return new DoorKeeper(
172172
TimeSeriesSettings.DOOR_KEEPER_FOR_CACHE_MAX_INSERTION,
173-
TimeSeriesSettings.DOOR_KEEPER_FAULSE_POSITIVE_RATE,
173+
TimeSeriesSettings.DOOR_KEEPER_FALSE_POSITIVE_RATE,
174174
detector.getDetectionIntervalDuration().multipliedBy(TimeSeriesSettings.DOOR_KEEPER_MAINTENANCE_FREQ),
175175
clock
176176
);

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import static org.opensearch.ad.settings.AnomalyDetectorSettings.CHECKPOINT_INDEX_MAPPING_FILE;
2121
import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_PRIMARY_SHARDS;
2222
import static org.opensearch.timeseries.constant.CommonMessages.CAN_NOT_FIND_RESULT_INDEX;
23-
import static org.opensearch.timeseries.settings.TimeSeriesSettings.ANOMALY_DETECTORS_INDEX_MAPPING_FILE;
24-
import static org.opensearch.timeseries.settings.TimeSeriesSettings.ANOMALY_DETECTOR_JOBS_INDEX_MAPPING_FILE;
23+
import static org.opensearch.timeseries.settings.TimeSeriesSettings.INDEX_MAPPING_FILE;
24+
import static org.opensearch.timeseries.settings.TimeSeriesSettings.JOBS_INDEX_MAPPING_FILE;
2525

2626
import java.io.IOException;
2727
import java.net.URL;
@@ -238,7 +238,7 @@ private void initResultMapping() throws IOException {
238238
* @throws IOException IOException if mapping file can't be read correctly
239239
*/
240240
public static String getAnomalyDetectorMappings() throws IOException {
241-
URL url = AnomalyDetectionIndices.class.getClassLoader().getResource(ANOMALY_DETECTORS_INDEX_MAPPING_FILE);
241+
URL url = AnomalyDetectionIndices.class.getClassLoader().getResource(INDEX_MAPPING_FILE);
242242
return Resources.toString(url, Charsets.UTF_8);
243243
}
244244

@@ -260,7 +260,7 @@ public static String getAnomalyResultMappings() throws IOException {
260260
* @throws IOException IOException if mapping file can't be read correctly
261261
*/
262262
public static String getAnomalyDetectorJobMappings() throws IOException {
263-
URL url = AnomalyDetectionIndices.class.getClassLoader().getResource(ANOMALY_DETECTOR_JOBS_INDEX_MAPPING_FILE);
263+
URL url = AnomalyDetectionIndices.class.getClassLoader().getResource(JOBS_INDEX_MAPPING_FILE);
264264
return Resources.toString(url, Charsets.UTF_8);
265265
}
266266

‎src/main/java/org/opensearch/ad/ml/EntityColdStarter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.opensearch.ad.model.IntervalTimeConfiguration;
5252
import org.opensearch.ad.ratelimit.CheckpointWriteWorker;
5353
import org.opensearch.ad.ratelimit.RequestPriority;
54-
import org.opensearch.ad.settings.EnabledSetting;
54+
import org.opensearch.ad.settings.ADEnabledSetting;
5555
import org.opensearch.ad.util.ExceptionUtil;
5656
import org.opensearch.common.settings.Settings;
5757
import org.opensearch.threadpool.ThreadPool;
@@ -252,7 +252,7 @@ private void coldStart(
252252
// reset every 60 intervals
253253
return new DoorKeeper(
254254
TimeSeriesSettings.DOOR_KEEPER_FOR_COLD_STARTER_MAX_INSERTION,
255-
TimeSeriesSettings.DOOR_KEEPER_FAULSE_POSITIVE_RATE,
255+
TimeSeriesSettings.DOOR_KEEPER_FALSE_POSITIVE_RATE,
256256
detector.getDetectionIntervalDuration().multipliedBy(TimeSeriesSettings.DOOR_KEEPER_MAINTENANCE_FREQ),
257257
clock
258258
);
@@ -596,7 +596,7 @@ private int calculateColdStartDataSize(List<double[][]> coldStartData) {
596596
*/
597597
private Pair<Integer, Integer> selectRangeParam(AnomalyDetector detector) {
598598
int shingleSize = detector.getShingleSize();
599-
if (EnabledSetting.isInterpolationInColdStartEnabled()) {
599+
if (ADEnabledSetting.isInterpolationInColdStartEnabled()) {
600600
long delta = detector.getDetectorIntervalInMinutes();
601601

602602
int strideLength = defaulStrideLength;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.opensearch.ad.common.exception.ADValidationException;
3434
import org.opensearch.ad.constant.ADCommonMessages;
3535
import org.opensearch.ad.constant.CommonValue;
36-
import org.opensearch.ad.settings.NumericSetting;
36+
import org.opensearch.ad.settings.ADNumericSetting;
3737
import org.opensearch.ad.util.ParseUtils;
3838
import org.opensearch.common.ParsingException;
3939
import org.opensearch.common.io.stream.StreamInput;
@@ -196,7 +196,7 @@ public AnomalyDetector(
196196
ValidationAspect.DETECTOR
197197
);
198198
}
199-
int maxCategoryFields = NumericSetting.maxCategoricalFields();
199+
int maxCategoryFields = ADNumericSetting.maxCategoricalFields();
200200
if (categoryFields != null && categoryFields.size() > maxCategoryFields) {
201201
throw new ADValidationException(
202202
CommonMessages.getTooManyCategoricalFieldErr(maxCategoryFields),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.opensearch.action.search.SearchRequest;
2626
import org.opensearch.action.search.SearchResponse;
2727
import org.opensearch.ad.constant.ADCommonMessages;
28-
import org.opensearch.ad.settings.EnabledSetting;
28+
import org.opensearch.ad.settings.ADEnabledSetting;
2929
import org.opensearch.client.node.NodeClient;
3030
import org.opensearch.core.xcontent.ToXContentObject;
3131
import org.opensearch.rest.BaseRestHandler;
@@ -66,7 +66,7 @@ public AbstractSearchAction(
6666

6767
@Override
6868
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
69-
if (!EnabledSetting.isADPluginEnabled()) {
69+
if (!ADEnabledSetting.isADEnabled()) {
7070
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
7171
}
7272
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.opensearch.ad.AnomalyDetectorPlugin;
2727
import org.opensearch.ad.constant.ADCommonMessages;
2828
import org.opensearch.ad.model.DetectionDateRange;
29-
import org.opensearch.ad.settings.EnabledSetting;
29+
import org.opensearch.ad.settings.ADEnabledSetting;
3030
import org.opensearch.ad.transport.AnomalyDetectorJobAction;
3131
import org.opensearch.ad.transport.AnomalyDetectorJobRequest;
3232
import org.opensearch.client.node.NodeClient;
@@ -61,7 +61,7 @@ public String getName() {
6161

6262
@Override
6363
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
64-
if (!EnabledSetting.isADPluginEnabled()) {
64+
if (!ADEnabledSetting.isADEnabled()) {
6565
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
6666
}
6767

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.opensearch.ad.AnomalyDetectorPlugin;
2323
import org.opensearch.ad.constant.ADCommonMessages;
2424
import org.opensearch.ad.rest.handler.AnomalyDetectorActionHandler;
25-
import org.opensearch.ad.settings.EnabledSetting;
25+
import org.opensearch.ad.settings.ADEnabledSetting;
2626
import org.opensearch.ad.transport.DeleteAnomalyDetectorAction;
2727
import org.opensearch.ad.transport.DeleteAnomalyDetectorRequest;
2828
import org.opensearch.client.node.NodeClient;
@@ -51,7 +51,7 @@ public String getName() {
5151

5252
@Override
5353
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
54-
if (!EnabledSetting.isADPluginEnabled()) {
54+
if (!ADEnabledSetting.isADEnabled()) {
5555
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
5656
}
5757

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.opensearch.action.support.IndicesOptions;
2323
import org.opensearch.ad.AnomalyDetectorPlugin;
2424
import org.opensearch.ad.constant.ADCommonMessages;
25-
import org.opensearch.ad.settings.EnabledSetting;
25+
import org.opensearch.ad.settings.ADEnabledSetting;
2626
import org.opensearch.ad.transport.DeleteAnomalyResultsAction;
2727
import org.opensearch.client.node.NodeClient;
2828
import org.opensearch.core.xcontent.ToXContent;
@@ -62,7 +62,7 @@ public String getName() {
6262

6363
@Override
6464
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
65-
if (!EnabledSetting.isADPluginEnabled()) {
65+
if (!ADEnabledSetting.isADEnabled()) {
6666
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
6767
}
6868
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.opensearch.ad.AnomalyDetectorPlugin;
2727
import org.opensearch.ad.constant.ADCommonMessages;
2828
import org.opensearch.ad.model.AnomalyDetectorExecutionInput;
29-
import org.opensearch.ad.settings.EnabledSetting;
29+
import org.opensearch.ad.settings.ADEnabledSetting;
3030
import org.opensearch.ad.transport.AnomalyResultAction;
3131
import org.opensearch.ad.transport.AnomalyResultRequest;
3232
import org.opensearch.client.node.NodeClient;
@@ -65,7 +65,7 @@ public String getName() {
6565

6666
@Override
6767
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
68-
if (!EnabledSetting.isADPluginEnabled()) {
68+
if (!ADEnabledSetting.isADEnabled()) {
6969
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
7070
}
7171
AnomalyDetectorExecutionInput input = getAnomalyDetectorExecutionInput(request);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.opensearch.ad.constant.ADCommonMessages;
2727
import org.opensearch.ad.constant.ADCommonName;
2828
import org.opensearch.ad.model.Entity;
29-
import org.opensearch.ad.settings.EnabledSetting;
29+
import org.opensearch.ad.settings.ADEnabledSetting;
3030
import org.opensearch.ad.transport.GetAnomalyDetectorAction;
3131
import org.opensearch.ad.transport.GetAnomalyDetectorRequest;
3232
import org.opensearch.client.node.NodeClient;
@@ -56,7 +56,7 @@ public String getName() {
5656

5757
@Override
5858
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
59-
if (!EnabledSetting.isADPluginEnabled()) {
59+
if (!ADEnabledSetting.isADEnabled()) {
6060
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
6161
}
6262
String detectorId = request.param(DETECTOR_ID);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.opensearch.ad.AnomalyDetectorPlugin;
2828
import org.opensearch.ad.constant.ADCommonMessages;
2929
import org.opensearch.ad.model.AnomalyDetector;
30-
import org.opensearch.ad.settings.EnabledSetting;
30+
import org.opensearch.ad.settings.ADEnabledSetting;
3131
import org.opensearch.ad.transport.IndexAnomalyDetectorAction;
3232
import org.opensearch.ad.transport.IndexAnomalyDetectorRequest;
3333
import org.opensearch.ad.transport.IndexAnomalyDetectorResponse;
@@ -65,7 +65,7 @@ public String getName() {
6565

6666
@Override
6767
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
68-
if (!EnabledSetting.isADPluginEnabled()) {
68+
if (!ADEnabledSetting.isADEnabled()) {
6969
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
7070
}
7171

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.opensearch.ad.AnomalyDetectorPlugin;
2525
import org.opensearch.ad.constant.ADCommonMessages;
2626
import org.opensearch.ad.model.AnomalyDetectorExecutionInput;
27-
import org.opensearch.ad.settings.EnabledSetting;
27+
import org.opensearch.ad.settings.ADEnabledSetting;
2828
import org.opensearch.ad.transport.PreviewAnomalyDetectorAction;
2929
import org.opensearch.ad.transport.PreviewAnomalyDetectorRequest;
3030
import org.opensearch.ad.util.RestHandlerUtils;
@@ -54,7 +54,7 @@ public String getName() {
5454

5555
@Override
5656
protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.client.node.NodeClient client) throws IOException {
57-
if (!EnabledSetting.isADPluginEnabled()) {
57+
if (!ADEnabledSetting.isADEnabled()) {
5858
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
5959
}
6060

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.logging.log4j.Logger;
2323
import org.opensearch.ad.AnomalyDetectorPlugin;
2424
import org.opensearch.ad.constant.ADCommonMessages;
25-
import org.opensearch.ad.settings.EnabledSetting;
25+
import org.opensearch.ad.settings.ADEnabledSetting;
2626
import org.opensearch.ad.transport.SearchAnomalyDetectorInfoAction;
2727
import org.opensearch.ad.transport.SearchAnomalyDetectorInfoRequest;
2828
import org.opensearch.rest.BaseRestHandler;
@@ -47,7 +47,7 @@ public String getName() {
4747

4848
@Override
4949
protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.client.node.NodeClient client) throws IOException {
50-
if (!EnabledSetting.isADPluginEnabled()) {
50+
if (!ADEnabledSetting.isADEnabled()) {
5151
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
5252
}
5353

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.opensearch.ad.AnomalyDetectorPlugin;
2525
import org.opensearch.ad.constant.ADCommonMessages;
2626
import org.opensearch.ad.model.AnomalyResult;
27-
import org.opensearch.ad.settings.EnabledSetting;
27+
import org.opensearch.ad.settings.ADEnabledSetting;
2828
import org.opensearch.ad.transport.SearchAnomalyResultAction;
2929
import org.opensearch.client.node.NodeClient;
3030
import org.opensearch.rest.RestRequest;
@@ -57,7 +57,7 @@ public String getName() {
5757

5858
@Override
5959
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
60-
if (!EnabledSetting.isADPluginEnabled()) {
60+
if (!ADEnabledSetting.isADEnabled()) {
6161
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
6262
}
6363

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.opensearch.ad.AnomalyDetectorPlugin;
2121
import org.opensearch.ad.constant.ADCommonMessages;
22-
import org.opensearch.ad.settings.EnabledSetting;
22+
import org.opensearch.ad.settings.ADEnabledSetting;
2323
import org.opensearch.ad.transport.SearchTopAnomalyResultAction;
2424
import org.opensearch.ad.transport.SearchTopAnomalyResultRequest;
2525
import org.opensearch.ad.util.RestHandlerUtils;
@@ -58,7 +58,7 @@ public String getName() {
5858
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
5959

6060
// Throw error if disabled
61-
if (!EnabledSetting.isADPluginEnabled()) {
61+
if (!ADEnabledSetting.isADEnabled()) {
6262
throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG);
6363
}
6464

0 commit comments

Comments
 (0)