From c610774df51066d7499b904f05c984132729732a Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 1 Aug 2023 08:20:10 -0400 Subject: [PATCH] update import orderings Signed-off-by: Derek Ho --- .../observability/action/CreateObservabilityObjectRequest.kt | 2 +- .../observability/action/CreateObservabilityObjectResponse.kt | 2 +- .../observability/action/DeleteObservabilityObjectResponse.kt | 2 +- .../observability/action/GetObservabilityObjectRequest.kt | 2 +- .../observability/action/UpdateObservabilityObjectRequest.kt | 2 +- .../kotlin/org/opensearch/observability/model/SearchResults.kt | 2 +- .../kotlin/org/opensearch/observability/PluginRestTestCase.kt | 2 +- .../org/opensearch/observability/rest/AssemblyValidationIT.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt index 5dac93172..f6e21207b 100644 --- a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt @@ -16,8 +16,8 @@ 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.observability.metrics.Metrics import org.opensearch.core.xcontent.XContentParserUtils +import org.opensearch.observability.metrics.Metrics import org.opensearch.observability.model.BaseObjectData import org.opensearch.observability.model.ObservabilityObjectDataProperties import org.opensearch.observability.model.ObservabilityObjectType diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt index 0846d8b71..93dc14df5 100644 --- a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt @@ -12,8 +12,8 @@ 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.observability.metrics.Metrics import org.opensearch.core.xcontent.XContentParserUtils +import org.opensearch.observability.metrics.Metrics import org.opensearch.observability.model.BaseResponse import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD import java.io.IOException diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt index 64a503f9a..b5ebb4e9b 100644 --- a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt @@ -17,8 +17,8 @@ import org.opensearch.core.rest.RestStatus import org.opensearch.core.xcontent.ToXContent import org.opensearch.core.xcontent.XContentBuilder import org.opensearch.core.xcontent.XContentParser -import org.opensearch.observability.metrics.Metrics import org.opensearch.core.xcontent.XContentParserUtils +import org.opensearch.observability.metrics.Metrics import org.opensearch.observability.model.BaseResponse import org.opensearch.observability.model.RestTag.DELETE_RESPONSE_LIST_TAG import java.io.IOException diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt index 6bd6b86ee..755ec0efd 100644 --- a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt @@ -22,8 +22,8 @@ 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.observability.metrics.Metrics import org.opensearch.core.xcontent.XContentParserUtils +import org.opensearch.observability.metrics.Metrics import org.opensearch.observability.model.ObservabilityObjectType import org.opensearch.observability.model.RestTag.FILTER_PARAM_LIST_FIELD import org.opensearch.observability.model.RestTag.FROM_INDEX_FIELD diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt index d7aa54da2..12bf7cc8c 100644 --- a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt @@ -16,8 +16,8 @@ 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.observability.metrics.Metrics import org.opensearch.core.xcontent.XContentParserUtils +import org.opensearch.observability.metrics.Metrics import org.opensearch.observability.model.BaseObjectData import org.opensearch.observability.model.ObservabilityObjectDataProperties import org.opensearch.observability.model.ObservabilityObjectType diff --git a/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt b/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt index 1255d48e0..9ca1b8883 100644 --- a/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt +++ b/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt @@ -15,8 +15,8 @@ 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.observability.metrics.Metrics import org.opensearch.core.xcontent.XContentParserUtils +import org.opensearch.observability.metrics.Metrics import org.opensearch.search.SearchHit internal abstract class SearchResults : BaseModel { diff --git a/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt b/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt index 35fd9ae3c..f97e36b24 100644 --- a/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt +++ b/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt @@ -22,10 +22,10 @@ import org.opensearch.common.settings.Settings import org.opensearch.common.xcontent.XContentType import org.opensearch.commons.ConfigConstants import org.opensearch.commons.rest.SecureRestClientBuilder +import org.opensearch.core.rest.RestStatus import org.opensearch.core.xcontent.DeprecationHandler import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.rest.RestRequest -import org.opensearch.core.rest.RestStatus import org.opensearch.test.rest.OpenSearchRestTestCase import java.io.BufferedReader import java.io.IOException diff --git a/src/test/kotlin/org/opensearch/observability/rest/AssemblyValidationIT.kt b/src/test/kotlin/org/opensearch/observability/rest/AssemblyValidationIT.kt index cfe0921f2..8a7d1bec0 100644 --- a/src/test/kotlin/org/opensearch/observability/rest/AssemblyValidationIT.kt +++ b/src/test/kotlin/org/opensearch/observability/rest/AssemblyValidationIT.kt @@ -6,9 +6,9 @@ package org.opensearch.observability.rest import org.junit.Assert +import org.opensearch.core.rest.RestStatus import org.opensearch.observability.PluginRestTestCase import org.opensearch.rest.RestRequest -import org.opensearch.core.rest.RestStatus class AssemblyValidationIT : PluginRestTestCase() { companion object {