update some more

Signed-off-by: Derek Ho <[email protected]>
opensearch-project · Jul 13, 2023 · 9aaaa87 · 9aaaa87
1 parent d3aedf2
commit 9aaaa87
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt b/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt
@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
+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.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/model/SavedQuery.kt b/src/main/kotlin/org/opensearch/observability/model/SavedQuery.kt
@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
+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.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/model/SavedVisualization.kt b/src/main/kotlin/org/opensearch/observability/model/SavedVisualization.kt
@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
+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.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt b/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt
@@ -9,13 +9,13 @@ import org.apache.lucene.search.TotalHits.Relation
 import org.apache.lucene.search.TotalHits.Relation.EQUAL_TO
 import org.apache.lucene.search.TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO
 import org.opensearch.action.search.SearchResponse
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
+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.xcontent.ToXContent.Params
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.search.SearchHit
 
 internal abstract class SearchResults<ItemClass : BaseModel> : BaseModel {

diff --git a/src/main/kotlin/org/opensearch/observability/model/Timestamp.kt b/src/main/kotlin/org/opensearch/observability/model/Timestamp.kt
@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
+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.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/resthandler/ObservabilityStatsRestHandler.kt b/src/main/kotlin/org/opensearch/observability/resthandler/ObservabilityStatsRestHandler.kt
@@ -1,6 +1,7 @@
 package org.opensearch.observability.resthandler
 
 import org.opensearch.client.node.NodeClient
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.observability.ObservabilityPlugin.Companion.BASE_OBSERVABILITY_URI
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.rest.BaseRestHandler
@@ -9,7 +10,6 @@ import org.opensearch.rest.BytesRestResponse
 import org.opensearch.rest.RestHandler.Route
 import org.opensearch.rest.RestRequest
 import org.opensearch.rest.RestRequest.Method.GET
-import org.opensearch.rest.RestStatus
 
 /**
  * Rest handler for getting observability backend stats

diff --git a/src/main/kotlin/org/opensearch/observability/resthandler/RestResponseToXContentListener.kt b/src/main/kotlin/org/opensearch/observability/resthandler/RestResponseToXContentListener.kt
@@ -5,8 +5,8 @@
 
 package org.opensearch.observability.resthandler
 
-import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.rest.RestStatus
+import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.rest.BytesRestResponse

diff --git a/src/main/kotlin/org/opensearch/observability/util/Helpers.kt b/src/main/kotlin/org/opensearch/observability/util/Helpers.kt
@@ -7,16 +7,16 @@ package org.opensearch.observability.util
 
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.common.xcontent.XContentType
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.DeprecationHandler
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.core.xcontent.XContentParser.Token
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.rest.RestRequest
 
 internal fun StreamInput.createJsonParser(): XContentParser {