Skip to content

Commit c9c8860

Browse files
authored
core refactor change (#887)
Signed-off-by: Hailong Cui <ihailong@amazon.com>
1 parent c83fdc5 commit c9c8860

File tree

10 files changed

+10
-11
lines changed

10 files changed

+10
-11
lines changed

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionMetaData.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.model
77

8-
import org.opensearch.common.Strings
8+
import org.opensearch.core.common.Strings
99
import org.opensearch.core.common.io.stream.StreamInput
1010
import org.opensearch.core.common.io.stream.StreamOutput
1111
import org.opensearch.core.common.io.stream.Writeable

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

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

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

8-
import org.opensearch.common.Strings
98
import org.opensearch.core.common.io.stream.StreamInput
109
import org.opensearch.core.common.io.stream.StreamOutput
1110
import org.opensearch.core.common.io.stream.Writeable
@@ -57,7 +56,7 @@ data class ManagedIndexMetaData(
5756
if (actionMetaData != null) resultMap[ActionMetaData.ACTION] = actionMetaData.getMapValueString()
5857
if (stepMetaData != null) resultMap[StepMetaData.STEP] = stepMetaData.getMapValueString()
5958
if (policyRetryInfo != null) resultMap[PolicyRetryInfoMetaData.RETRY_INFO] = policyRetryInfo.getMapValueString()
60-
if (info != null) resultMap[INFO] = Strings.toString(XContentFactory.jsonBuilder().map(info))
59+
if (info != null) resultMap[INFO] = XContentFactory.jsonBuilder().map(info).toString()
6160

6261
return resultMap
6362
}

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/PolicyRetryInfoMetaData.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.model
77

8-
import org.opensearch.common.Strings
8+
import org.opensearch.core.common.Strings
99
import org.opensearch.core.common.io.stream.StreamInput
1010
import org.opensearch.core.common.io.stream.StreamOutput
1111
import org.opensearch.core.common.io.stream.Writeable

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/StateMetaData.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.model
77

8-
import org.opensearch.common.Strings
8+
import org.opensearch.core.common.Strings
99
import org.opensearch.core.common.io.stream.StreamInput
1010
import org.opensearch.core.common.io.stream.StreamOutput
1111
import org.opensearch.core.common.io.stream.Writeable

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/StepMetaData.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.model
77

8-
import org.opensearch.common.Strings
8+
import org.opensearch.core.common.Strings
99
import org.opensearch.core.common.io.stream.StreamInput
1010
import org.opensearch.core.common.io.stream.StreamOutput
1111
import org.opensearch.core.common.io.stream.Writeable

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ValidationResult.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.model
77

8-
import org.opensearch.common.Strings
8+
import org.opensearch.core.common.Strings
99
import org.opensearch.core.common.io.stream.StreamInput
1010
import org.opensearch.core.common.io.stream.StreamOutput
1111
import org.opensearch.core.common.io.stream.Writeable

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ISMTemplateService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package org.opensearch.indexmanagement.indexstatemanagement
77

88
import org.apache.lucene.util.automaton.Operations
99
import org.opensearch.OpenSearchException
10-
import org.opensearch.common.Strings
10+
import org.opensearch.core.common.Strings
1111
import org.opensearch.common.ValidationException
1212
import org.opensearch.common.regex.Regex
1313
import org.opensearch.indexmanagement.indexstatemanagement.model.ISMTemplate

src/main/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SMUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import org.opensearch.action.get.GetResponse
1717
import org.opensearch.action.index.IndexRequest
1818
import org.opensearch.action.index.IndexResponse
1919
import org.opensearch.client.Client
20-
import org.opensearch.common.Strings
20+
import org.opensearch.core.common.Strings
2121
import org.opensearch.common.time.DateFormatter
2222
import org.opensearch.common.unit.TimeValue
2323
import org.opensearch.common.xcontent.LoggingDeprecationHandler

src/test/kotlin/org/opensearch/indexmanagement/IndexManagementRestTestCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import org.opensearch.client.RestClient
1717
import org.opensearch.client.RequestOptions
1818
import org.opensearch.client.WarningsHandler
1919
import org.opensearch.client.ResponseException
20-
import org.opensearch.common.Strings
20+
import org.opensearch.core.common.Strings
2121
import org.opensearch.common.io.PathUtils
2222
import org.opensearch.common.settings.Settings
2323
import org.opensearch.core.xcontent.DeprecationHandler

src/test/kotlin/org/opensearch/indexmanagement/SecurityRestTestCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.opensearch.client.Request
1919
import org.opensearch.client.Response
2020
import org.opensearch.client.ResponseException
2121
import org.opensearch.client.RestClient
22-
import org.opensearch.common.Strings
22+
import org.opensearch.core.common.Strings
2323
import org.opensearch.common.settings.Settings
2424
import org.opensearch.common.xcontent.XContentType
2525
import org.opensearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase

0 commit comments

Comments
 (0)