Skip to content

Commit

Permalink
Fix after core #8157
Browse files Browse the repository at this point in the history 
Signed-off-by: bowenlan-amzn <[email protected]>
  • Loading branch information
@bowenlan-amzn
bowenlan-amzn committed Jul 13, 2023
1 parent d21660f commit 2faffcf
Show file tree
Hide file tree
Showing 145 changed files with 377 additions and 377 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/commons/ConfigConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package org.opensearch.commons;

import org.opensearch.common.settings.SecureSetting;
import org.opensearch.common.settings.SecureString;
import org.opensearch.common.settings.Setting;
import org.opensearch.core.common.settings.SecureString;

public class ConfigConstants {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/opensearch/commons/authuser/User.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package org.opensearch.commons.authuser;

import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -19,9 +19,9 @@
import org.opensearch.client.Response;
import org.opensearch.common.Nullable;
import org.opensearch.common.inject.internal.ToStringBuilder;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.Writeable;
import org.opensearch.common.xcontent.XContentHelper;
import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.core.common.Strings;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import java.util.Map;

import org.apache.hc.core5.net.URIBuilder;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.Writeable;
import org.opensearch.core.common.Strings;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import java.io.IOException;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.Strings;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import org.apache.hc.client5.http.classic.methods.HttpPatch;
import org.apache.hc.client5.http.classic.methods.HttpPost;
import org.apache.hc.client5.http.classic.methods.HttpPut;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.Strings;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import java.net.URI;
import java.util.List;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.commons.notifications.model.MethodType;
import org.opensearch.core.common.Strings;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import java.io.IOException;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.commons.destination.util.Util;
import org.opensearch.core.common.Strings;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import java.io.IOException;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.Strings;

/**
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/opensearch/commons/destination/response/LegacyBaseResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import java.io.IOException;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.Writeable;

/**
* This class holds the generic response attributes
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/commons/destination/response/LegacyDestinationResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import java.io.IOException;

import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;

/**
* This class is a place holder for destination response metadata
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/AlertingPluginInterface.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package org.opensearch.commons.alerting
import org.opensearch.action.ActionListener
import org.opensearch.action.ActionResponse
import org.opensearch.client.node.NodeClient
import org.opensearch.common.io.stream.NamedWriteableRegistry
import org.opensearch.common.io.stream.Writeable
import org.opensearch.core.common.io.stream.NamedWriteableRegistry
import org.opensearch.core.common.io.stream.Writeable
import org.opensearch.commons.alerting.action.AcknowledgeAlertRequest
import org.opensearch.commons.alerting.action.AcknowledgeAlertResponse
import org.opensearch.commons.alerting.action.AcknowledgeChainedAlertRequest
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package org.opensearch.commons.alerting.action
import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.action.support.WriteRequest
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import java.io.IOException
import java.util.Collections

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponse.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Alert
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import java.io.IOException
import java.util.Collections

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package org.opensearch.commons.alerting.action
import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.action.support.WriteRequest
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import java.io.IOException

class DeleteMonitorRequest : ActionRequest {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.util.IndexUtils
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import java.io.IOException

class DeleteWorkflowRequest : ActionRequest {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.util.IndexUtils
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Table
import java.io.IOException

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Alert
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Table
import java.io.IOException

Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.FindingWithDocs
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
import org.opensearch.core.xcontent.XContentBuilder
import org.opensearch.rest.RestStatus
import org.opensearch.core.rest.RestStatus
import java.io.IOException

class GetFindingsResponse : BaseResponse {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Table
import java.io.IOException

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Alert
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.rest.RestRequest
import java.io.IOException

Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponse.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Workflow
import org.opensearch.commons.alerting.util.IndexUtils.Companion._ID
import org.opensearch.commons.alerting.util.IndexUtils.Companion._PRIMARY_TERM
Expand All @@ -15,7 +15,7 @@ import org.opensearch.commons.alerting.util.IndexUtils.Companion._VERSION
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
import org.opensearch.core.xcontent.XContentBuilder
import org.opensearch.rest.RestStatus
import org.opensearch.core.rest.RestStatus
import java.io.IOException

class GetWorkflowResponse : BaseResponse {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package org.opensearch.commons.alerting.action
import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.action.support.WriteRequest
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Monitor
import org.opensearch.rest.RestRequest
import java.io.IOException
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Monitor
import org.opensearch.commons.alerting.util.IndexUtils.Companion._ID
import org.opensearch.commons.alerting.util.IndexUtils.Companion._PRIMARY_TERM
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.action.ValidateActions
import org.opensearch.action.support.WriteRequest
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.CompositeInput
import org.opensearch.commons.alerting.model.Workflow
import org.opensearch.rest.RestRequest
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Workflow
import org.opensearch.commons.alerting.util.IndexUtils
import org.opensearch.commons.notifications.action.BaseResponse
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.opensearch.commons.alerting.action

import org.opensearch.action.ActionRequest
import org.opensearch.action.ActionRequestValidationException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.model.Finding
import java.io.IOException

Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/opensearch/commons/alerting/action/SubscribeFindingsResponse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.opensearch.commons.alerting.action

import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.notifications.action.BaseResponse
import org.opensearch.core.xcontent.ToXContent
import org.opensearch.core.xcontent.XContentBuilder
import org.opensearch.rest.RestStatus
import org.opensearch.core.rest.RestStatus
import java.io.IOException

class SubscribeFindingsResponse : BaseResponse {
Expand Down
6 changes: 3 additions & 3 deletions ...rch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregationBuilder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.opensearch.commons.alerting.aggregation.bucketselectorext

import org.opensearch.common.ParsingException
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.common.io.stream.StreamOutput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamOutput
import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtFilter.Companion.BUCKET_SELECTOR_COMPOSITE_AGG_FILTER
import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtFilter.Companion.BUCKET_SELECTOR_FILTER
import org.opensearch.core.ParseField
import org.opensearch.core.common.ParsingException
import org.opensearch.core.xcontent.ToXContent
import org.opensearch.core.xcontent.XContentBuilder
import org.opensearch.core.xcontent.XContentParser
Expand Down
2 changes: 1 addition & 1 deletion .../opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregator.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.commons.alerting.aggregation.bucketselectorext

import org.apache.lucene.util.BytesRef
import org.opensearch.common.io.stream.StreamInput
import org.opensearch.core.common.io.stream.StreamInput
import org.opensearch.script.BucketAggregationSelectorScript
import org.opensearch.script.Script
import org.opensearch.search.DocValueFormat
Expand Down
Loading

0 comments on commit 2faffcf

Please sign in to comment.