Skip to content

Commit 4a6c92b

Browse files
Fix after core #8157 (#857)
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
1 parent 99df725 commit 4a6c92b

File tree

303 files changed

+580
-580
lines changed

Some content is hidden

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

303 files changed

+580
-580
lines changed

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Action.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement
77

8-
import org.opensearch.common.io.stream.StreamOutput
9-
import org.opensearch.common.io.stream.Writeable
8+
import org.opensearch.core.common.io.stream.StreamOutput
9+
import org.opensearch.core.common.io.stream.Writeable
1010
import org.opensearch.core.xcontent.ToXContent
1111
import org.opensearch.core.xcontent.ToXContentObject
1212
import org.opensearch.core.xcontent.XContentBuilder

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/ActionParser.kt

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

66
package org.opensearch.indexmanagement.spi.indexstatemanagement
77

8-
import org.opensearch.common.io.stream.StreamInput
8+
import org.opensearch.core.common.io.stream.StreamInput
99
import org.opensearch.core.xcontent.XContentParser
1010

1111
abstract class ActionParser(var customAction: Boolean = false) {

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Step.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement
77

88
import org.apache.logging.log4j.Logger
9-
import org.opensearch.common.io.stream.StreamInput
10-
import org.opensearch.common.io.stream.StreamOutput
11-
import org.opensearch.common.io.stream.Writeable
9+
import org.opensearch.core.common.io.stream.StreamInput
10+
import org.opensearch.core.common.io.stream.StreamOutput
11+
import org.opensearch.core.common.io.stream.Writeable
1212
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData
1313
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.StepContext
1414
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.StepMetaData

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Validate.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement
77

88
import org.opensearch.cluster.service.ClusterService
9-
import org.opensearch.common.io.stream.StreamInput
10-
import org.opensearch.common.io.stream.StreamOutput
11-
import org.opensearch.common.io.stream.Writeable
9+
import org.opensearch.core.common.io.stream.StreamInput
10+
import org.opensearch.core.common.io.stream.StreamOutput
11+
import org.opensearch.core.common.io.stream.Writeable
1212
import org.opensearch.common.settings.Settings
1313
import org.opensearch.monitor.jvm.JvmService
1414
import java.util.Locale

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionMetaData.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

88
import org.opensearch.common.Strings
9-
import org.opensearch.common.io.stream.StreamInput
10-
import org.opensearch.common.io.stream.StreamOutput
11-
import org.opensearch.common.io.stream.Writeable
9+
import org.opensearch.core.common.io.stream.StreamInput
10+
import org.opensearch.core.common.io.stream.StreamOutput
11+
import org.opensearch.core.common.io.stream.Writeable
1212
import org.opensearch.common.xcontent.LoggingDeprecationHandler
1313
import org.opensearch.core.xcontent.NamedXContentRegistry
1414
import org.opensearch.core.xcontent.ToXContent
1515
import org.opensearch.core.xcontent.ToXContentFragment
1616
import org.opensearch.core.xcontent.XContentBuilder
1717
import org.opensearch.core.xcontent.XContentParser
18-
import org.opensearch.common.xcontent.XContentParserUtils
1918
import org.opensearch.common.xcontent.XContentType
19+
import org.opensearch.core.xcontent.XContentParserUtils
2020
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME
2121
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME
2222
import java.io.ByteArrayInputStream

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionProperties.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8-
import org.opensearch.common.io.stream.StreamInput
9-
import org.opensearch.common.io.stream.StreamOutput
10-
import org.opensearch.common.io.stream.Writeable
8+
import org.opensearch.core.common.io.stream.StreamInput
9+
import org.opensearch.core.common.io.stream.StreamOutput
10+
import org.opensearch.core.common.io.stream.Writeable
1111
import org.opensearch.core.xcontent.ToXContent
1212
import org.opensearch.core.xcontent.ToXContentFragment
1313
import org.opensearch.core.xcontent.XContentBuilder
1414
import org.opensearch.core.xcontent.XContentParser
1515
import org.opensearch.core.xcontent.XContentParser.Token
16-
import org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken
16+
import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken
1717
import org.opensearch.indexmanagement.spi.indexstatemanagement.addObject
1818

1919
/** Properties that will persist across steps of a single Action. Will be stored in the [ActionMetaData]. */

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionRetry.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

88
import org.apache.logging.log4j.LogManager
9-
import org.opensearch.common.io.stream.StreamInput
10-
import org.opensearch.common.io.stream.StreamOutput
11-
import org.opensearch.common.io.stream.Writeable
9+
import org.opensearch.core.common.io.stream.StreamInput
10+
import org.opensearch.core.common.io.stream.StreamOutput
11+
import org.opensearch.core.common.io.stream.Writeable
1212
import org.opensearch.common.unit.TimeValue
1313
import org.opensearch.core.xcontent.ToXContent
1414
import org.opensearch.core.xcontent.ToXContentFragment
1515
import org.opensearch.core.xcontent.XContentBuilder
1616
import org.opensearch.core.xcontent.XContentParser
17-
import org.opensearch.common.xcontent.XContentParserUtils
17+
import org.opensearch.core.xcontent.XContentParserUtils
1818
import java.io.IOException
1919
import java.time.Instant
2020
import java.util.Locale

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionTimeout.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8-
import org.opensearch.common.io.stream.StreamInput
9-
import org.opensearch.common.io.stream.StreamOutput
10-
import org.opensearch.common.io.stream.Writeable
8+
import org.opensearch.core.common.io.stream.StreamInput
9+
import org.opensearch.core.common.io.stream.StreamOutput
10+
import org.opensearch.core.common.io.stream.Writeable
1111
import org.opensearch.common.unit.TimeValue
1212
import org.opensearch.core.xcontent.ToXContent
1313
import org.opensearch.core.xcontent.ToXContentFragment

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ManagedIndexMetaData.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

88
import org.opensearch.common.Strings
9-
import org.opensearch.common.io.stream.StreamInput
10-
import org.opensearch.common.io.stream.StreamOutput
11-
import org.opensearch.common.io.stream.Writeable
9+
import org.opensearch.core.common.io.stream.StreamInput
10+
import org.opensearch.core.common.io.stream.StreamOutput
11+
import org.opensearch.core.common.io.stream.Writeable
1212
import org.opensearch.core.xcontent.ToXContent
1313
import org.opensearch.core.xcontent.ToXContentFragment
1414
import org.opensearch.core.xcontent.XContentBuilder
1515
import org.opensearch.common.xcontent.XContentFactory
1616
import org.opensearch.common.xcontent.XContentHelper
1717
import org.opensearch.core.xcontent.XContentParser
18-
import org.opensearch.common.xcontent.XContentParserUtils
18+
import org.opensearch.core.xcontent.XContentParserUtils
1919
import org.opensearch.common.xcontent.json.JsonXContent
2020
import org.opensearch.index.seqno.SequenceNumbers
2121
import org.opensearch.indexmanagement.spi.indexstatemanagement.addObject

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/PolicyRetryInfoMetaData.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

88
import org.opensearch.common.Strings
9-
import org.opensearch.common.io.stream.StreamInput
10-
import org.opensearch.common.io.stream.StreamOutput
11-
import org.opensearch.common.io.stream.Writeable
9+
import org.opensearch.core.common.io.stream.StreamInput
10+
import org.opensearch.core.common.io.stream.StreamOutput
11+
import org.opensearch.core.common.io.stream.Writeable
1212
import org.opensearch.common.xcontent.LoggingDeprecationHandler
1313
import org.opensearch.core.xcontent.NamedXContentRegistry
1414
import org.opensearch.core.xcontent.ToXContent
1515
import org.opensearch.core.xcontent.ToXContentFragment
1616
import org.opensearch.core.xcontent.XContentBuilder
1717
import org.opensearch.core.xcontent.XContentParser
18-
import org.opensearch.common.xcontent.XContentParserUtils
18+
import org.opensearch.core.xcontent.XContentParserUtils
1919
import org.opensearch.common.xcontent.XContentType
2020
import java.io.ByteArrayInputStream
2121
import java.nio.charset.StandardCharsets

0 commit comments

Comments
 (0)