From 18cd8440c7b1d105fd2c6955d909bbf5984b01da Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 7 Mar 2023 11:36:48 -0500 Subject: [PATCH] Fix main CI upstream opensearch imports and use maven repo instead of jenkins (#1437) * fix ci failures on main Signed-off-by: Derek Ho * change back some references Signed-off-by: Derek Ho * fix up Signed-off-by: Derek Ho * try incrementing bwc version to 2.7 Signed-off-by: Derek Ho * keep 2.6 Signed-off-by: Derek Ho * try using maven Signed-off-by: Derek Ho * fix zxip Signed-off-by: Derek Ho * fix version Signed-off-by: Derek Ho * fix snapshot Signed-off-by: Derek Ho * remove job scheduler url reef Signed-off-by: Derek Ho * add base version Signed-off-by: Derek Ho * hard code Signed-off-by: Derek Ho * try configuration zip Signed-off-by: Derek Ho * try zip archive Signed-off-by: Derek Ho * move dep Signed-off-by: Derek Ho * fix imports Signed-off-by: Derek Ho * fix last file Signed-off-by: Derek Ho * add back job scheduler bwc Signed-off-by: Derek Ho * add zip archive Signed-off-by: Derek Ho * move ot 2.7.0 bwc Signed-off-by: Derek Ho * hard code link Signed-off-by: Derek Ho --------- Signed-off-by: Derek Ho --- build.gradle | 29 +++++-------------- .../observability/ObservabilityPlugin.kt | 2 +- .../action/CreateObservabilityObjectAction.kt | 2 +- .../CreateObservabilityObjectRequest.kt | 8 ++--- .../CreateObservabilityObjectResponse.kt | 6 ++-- .../action/DeleteObservabilityObjectAction.kt | 2 +- .../DeleteObservabilityObjectRequest.kt | 8 ++--- .../DeleteObservabilityObjectResponse.kt | 6 ++-- .../action/GetObservabilityObjectAction.kt | 2 +- .../action/GetObservabilityObjectRequest.kt | 8 ++--- .../action/GetObservabilityObjectResponse.kt | 6 ++-- .../action/UpdateObservabilityObjectAction.kt | 2 +- .../UpdateObservabilityObjectRequest.kt | 8 ++--- .../UpdateObservabilityObjectResponse.kt | 8 ++--- .../observability/index/ObservabilityIndex.kt | 2 +- .../observability/model/Application.kt | 6 ++-- .../observability/model/BaseModel.kt | 2 +- .../observability/model/BaseResponse.kt | 6 ++-- .../observability/model/Notebook.kt | 6 ++-- .../ObservabilityObjectDataProperties.kt | 2 +- .../model/ObservabilityObjectDoc.kt | 6 ++-- .../model/ObservabilityObjectSearchResult.kt | 2 +- .../observability/model/OperationalPanel.kt | 6 ++-- .../opensearch/observability/model/RestTag.kt | 4 +-- .../observability/model/SavedQuery.kt | 6 ++-- .../observability/model/SavedVisualization.kt | 6 ++-- .../observability/model/ScheduledJobDoc.kt | 6 ++-- .../observability/model/SearchResults.kt | 6 ++-- .../observability/model/Timestamp.kt | 6 ++-- .../opensearch/observability/model/XParser.kt | 2 +- .../RestResponseToXContentListener.kt | 2 +- .../scheduler/ObservabilityJobParser.kt | 2 +- .../opensearch/observability/util/Helpers.kt | 14 ++++----- .../observability/PluginRestTestCase.kt | 4 +-- .../opensearch/observability/TestHelpers.kt | 8 ++--- 35 files changed, 93 insertions(+), 108 deletions(-) diff --git a/build.gradle b/build.gradle index f875ea0fd..82987824b 100644 --- a/build.gradle +++ b/build.gradle @@ -110,6 +110,7 @@ allOpen { configurations { ktlint + zipArchive } detekt { @@ -162,6 +163,7 @@ allprojects { } dependencies { + zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}" implementation "org.opensearch:opensearch:${opensearch_version}" implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}" @@ -286,7 +288,6 @@ integTest { Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin"); integTest.dependsOn(bundle) integTest.getClusters().forEach { c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile())) } -String jobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/" + opensearch_version.replace("-SNAPSHOT", "") + "/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-" + opensearch_build.replace("-SNAPSHOT", "") + ".zip" testClusters.integTest { testDistribution = "INTEG_TEST" @@ -297,15 +298,7 @@ testClusters.integTest { return new RegularFile() { @Override File getAsFile() { - File dir = new File("src/test/resources/job-scheduler") - if (!dir.exists()) { - dir.mkdirs() - } - File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip") - if (!file.exists()) { - new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} - } - return fileTree("src/test/resources/job-scheduler").getSingleFile() + return configurations.zipArchive.asFileTree.getSingleFile() } } } @@ -326,14 +319,14 @@ testClusters.integTest { setting 'path.repo', repo.absolutePath } -String baseVersion = "2.6.0" +String baseVersion = "2.7.0" String bwcVersion = baseVersion + ".0" String baseName = "obsBwcCluster" String bwcFilePath = "src/test/resources/bwc/" String bwcObservabilityPlugin = "opensearch-observability-" + bwcVersion + ".zip" String bwcJobSchedulerPlugin = "opensearch-job-scheduler-" + bwcVersion + ".zip" -String remoteFileURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${baseVersion}/latest/linux/x64/tar/builds/opensearch/plugins/" + bwcObservabilityPlugin -String bwcJobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${baseVersion}/latest/linux/x64/tar/builds/opensearch/plugins/" + bwcJobSchedulerPlugin +String remoteFileURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-observability/2.7.0.0-SNAPSHOT/opensearch-observability-2.7.0.0-20230307.002038-1.zip" +String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-job-scheduler/2.7.0.0-SNAPSHOT/opensearch-job-scheduler-2.7.0.0-20230307.020232-12.zip" 2.times {i -> testClusters { @@ -398,15 +391,7 @@ task prepareBwcTests { return new RegularFile() { @Override File getAsFile() { - File dir = new File(bwcFilePath + "job-scheduler/" + project.version) - if (!dir.exists()) { - dir.mkdirs() - } - File file = new File(dir, "opensearch-job-scheduler-" + project.version + ".zip") - if (!file.exists()) { - new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} - } - return fileTree(bwcFilePath + "job-scheduler/" + project.version).getSingleFile() + return configurations.zipArchive.asFileTree.getSingleFile() } } } diff --git a/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt b/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt index 1fcae8a03..2adefc155 100644 --- a/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt +++ b/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt @@ -16,7 +16,7 @@ import org.opensearch.common.settings.IndexScopedSettings import org.opensearch.common.settings.Setting import org.opensearch.common.settings.Settings import org.opensearch.common.settings.SettingsFilter -import org.opensearch.common.xcontent.NamedXContentRegistry +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.env.Environment import org.opensearch.env.NodeEnvironment import org.opensearch.jobscheduler.spi.JobSchedulerExtension diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt index 0e5cf4637..fa5ab373d 100644 --- a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt +++ b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt @@ -9,8 +9,8 @@ import org.opensearch.action.ActionType import org.opensearch.action.support.ActionFilters import org.opensearch.client.Client import org.opensearch.common.inject.Inject -import org.opensearch.common.xcontent.NamedXContentRegistry import org.opensearch.commons.authuser.User +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.transport.TransportService /** diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt index 8ce247d13..e7725afba 100644 --- a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt @@ -10,13 +10,13 @@ import org.opensearch.action.ActionRequestValidationException 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.ToXContent -import org.opensearch.common.xcontent.ToXContentObject -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.fieldIfNotNull import org.opensearch.commons.utils.logger +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.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 f9cb1bd35..d87206102 100644 --- a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt @@ -8,11 +8,11 @@ package org.opensearch.observability.action 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.logger +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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/DeleteObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt index 5e4d9dddb..2adc38a0f 100644 --- a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt +++ b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt @@ -9,8 +9,8 @@ import org.opensearch.action.ActionType import org.opensearch.action.support.ActionFilters import org.opensearch.client.Client import org.opensearch.common.inject.Inject -import org.opensearch.common.xcontent.NamedXContentRegistry import org.opensearch.commons.authuser.User +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.transport.TransportService /** diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt index ace60136f..bc9e1be59 100644 --- a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt @@ -11,13 +11,13 @@ import org.opensearch.action.ValidateActions 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.ToXContent -import org.opensearch.common.xcontent.ToXContentObject -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.logger import org.opensearch.commons.utils.stringList +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.ObservabilityPlugin.Companion.LOG_PREFIX import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD import org.opensearch.observability.model.RestTag.OBJECT_ID_LIST_FIELD diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt index cc4a4644a..dc1496f29 100644 --- a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt @@ -8,15 +8,15 @@ package org.opensearch.observability.action 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.STRING_READER import org.opensearch.commons.utils.STRING_WRITER import org.opensearch.commons.utils.enumReader import org.opensearch.commons.utils.enumWriter import org.opensearch.commons.utils.logger +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser import org.opensearch.observability.model.BaseResponse import org.opensearch.observability.model.RestTag.DELETE_RESPONSE_LIST_TAG import org.opensearch.rest.RestStatus diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt index 0c01ac06b..fea836835 100644 --- a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt +++ b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt @@ -9,8 +9,8 @@ import org.opensearch.action.ActionType import org.opensearch.action.support.ActionFilters import org.opensearch.client.Client import org.opensearch.common.inject.Inject -import org.opensearch.common.xcontent.NamedXContentRegistry import org.opensearch.commons.authuser.User +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.transport.TransportService /** diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt index 5a050f083..ee0a5afac 100644 --- a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt @@ -11,10 +11,6 @@ import org.opensearch.action.ValidateActions 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.ToXContent -import org.opensearch.common.xcontent.ToXContentObject -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.STRING_READER import org.opensearch.commons.utils.STRING_WRITER @@ -23,6 +19,10 @@ import org.opensearch.commons.utils.enumSet import org.opensearch.commons.utils.fieldIfNotNull import org.opensearch.commons.utils.logger import org.opensearch.commons.utils.stringList +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.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/GetObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectResponse.kt index 84db867c2..655318ffa 100644 --- a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectResponse.kt @@ -8,9 +8,9 @@ package org.opensearch.observability.action 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser import org.opensearch.observability.model.BaseResponse import org.opensearch.observability.model.ObservabilityObjectSearchResult import org.opensearch.observability.model.RestTag diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt index 9ec3a4f17..2cd85ab20 100644 --- a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt +++ b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt @@ -9,8 +9,8 @@ import org.opensearch.action.ActionType import org.opensearch.action.support.ActionFilters import org.opensearch.client.Client import org.opensearch.common.inject.Inject -import org.opensearch.common.xcontent.NamedXContentRegistry import org.opensearch.commons.authuser.User +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.transport.TransportService /** diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt index b6229b310..cd3e23057 100644 --- a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt +++ b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt @@ -12,13 +12,13 @@ import org.opensearch.common.Strings 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.ToXContent -import org.opensearch.common.xcontent.ToXContentObject -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.fieldIfNotNull import org.opensearch.commons.utils.logger +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.model.BaseObjectData import org.opensearch.observability.model.ObservabilityObjectDataProperties import org.opensearch.observability.model.ObservabilityObjectType diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt index 6ccf5f3d8..55788debb 100644 --- a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt @@ -7,11 +7,11 @@ package org.opensearch.observability.action import org.opensearch.common.io.stream.StreamInput import org.opensearch.common.io.stream.StreamOutput -import org.opensearch.common.xcontent.ToXContent -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser -import org.opensearch.common.xcontent.XContentParser.Token import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser +import org.opensearch.core.xcontent.XContentParser.Token import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX import org.opensearch.observability.model.BaseResponse import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD diff --git a/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt b/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt index 3363715f8..02a8dca82 100644 --- a/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt +++ b/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt @@ -22,8 +22,8 @@ import org.opensearch.client.Client import org.opensearch.cluster.service.ClusterService import org.opensearch.common.unit.TimeValue import org.opensearch.common.xcontent.LoggingDeprecationHandler -import org.opensearch.common.xcontent.NamedXContentRegistry import org.opensearch.common.xcontent.XContentType +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.index.IndexNotFoundException import org.opensearch.index.query.QueryBuilders import org.opensearch.index.reindex.ReindexAction diff --git a/src/main/kotlin/org/opensearch/observability/model/Application.kt b/src/main/kotlin/org/opensearch/observability/model/Application.kt index ad72c7c59..7fdf615ed 100644 --- a/src/main/kotlin/org/opensearch/observability/model/Application.kt +++ b/src/main/kotlin/org/opensearch/observability/model/Application.kt @@ -8,12 +8,12 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.stringList +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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/BaseModel.kt b/src/main/kotlin/org/opensearch/observability/model/BaseModel.kt index 0dc003236..976d4c530 100644 --- a/src/main/kotlin/org/opensearch/observability/model/BaseModel.kt +++ b/src/main/kotlin/org/opensearch/observability/model/BaseModel.kt @@ -6,7 +6,7 @@ package org.opensearch.observability.model import org.opensearch.common.io.stream.Writeable -import org.opensearch.common.xcontent.ToXContent +import org.opensearch.core.xcontent.ToXContent /** * interface for representing objects. diff --git a/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt b/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt index b5f26ad2c..8844772ec 100644 --- a/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt @@ -7,10 +7,10 @@ package org.opensearch.observability.model import org.opensearch.action.ActionResponse import org.opensearch.common.io.stream.StreamInput -import org.opensearch.common.xcontent.ToXContent -import org.opensearch.common.xcontent.ToXContentObject -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.ToXContentObject +import org.opensearch.core.xcontent.XContentBuilder import org.opensearch.rest.RestStatus import java.io.IOException diff --git a/src/main/kotlin/org/opensearch/observability/model/Notebook.kt b/src/main/kotlin/org/opensearch/observability/model/Notebook.kt index 9c387f986..23daf4cab 100644 --- a/src/main/kotlin/org/opensearch/observability/model/Notebook.kt +++ b/src/main/kotlin/org/opensearch/observability/model/Notebook.kt @@ -8,11 +8,11 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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/ObservabilityObjectDataProperties.kt b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDataProperties.kt index 4da7f24bb..9b46c3b65 100644 --- a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDataProperties.kt +++ b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDataProperties.kt @@ -6,7 +6,7 @@ package org.opensearch.observability.model import org.opensearch.common.io.stream.Writeable -import org.opensearch.common.xcontent.XContentParser +import org.opensearch.core.xcontent.XContentParser internal object ObservabilityObjectDataProperties { /** diff --git a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt index 828fd1033..50766416d 100644 --- a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt +++ b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt @@ -8,13 +8,13 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.commons.utils.logger import org.opensearch.commons.utils.stringList +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser import org.opensearch.observability.model.ObservabilityObjectDataProperties.getReaderForObjectType import org.opensearch.observability.model.RestTag.ACCESS_LIST_FIELD import org.opensearch.observability.model.RestTag.CREATED_TIME_FIELD diff --git a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt index 3cdff0a90..c312e9eb0 100644 --- a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt +++ b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt @@ -8,7 +8,7 @@ package org.opensearch.observability.model import org.apache.lucene.search.TotalHits import org.opensearch.action.search.SearchResponse import org.opensearch.common.io.stream.StreamInput -import org.opensearch.common.xcontent.XContentParser +import org.opensearch.core.xcontent.XContentParser import org.opensearch.observability.model.RestTag.OBJECT_LIST_FIELD /** diff --git a/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt b/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt index 676814e8e..735f33154 100644 --- a/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt +++ b/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt @@ -8,11 +8,11 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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/RestTag.kt b/src/main/kotlin/org/opensearch/observability/model/RestTag.kt index 3cb519aca..c8a168a1e 100644 --- a/src/main/kotlin/org/opensearch/observability/model/RestTag.kt +++ b/src/main/kotlin/org/opensearch/observability/model/RestTag.kt @@ -4,8 +4,8 @@ */ package org.opensearch.observability.model -import org.opensearch.common.xcontent.ToXContent -import org.opensearch.common.xcontent.ToXContent.Params +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.ToXContent.Params /** * Plugin Rest common Tags. diff --git a/src/main/kotlin/org/opensearch/observability/model/SavedQuery.kt b/src/main/kotlin/org/opensearch/observability/model/SavedQuery.kt index 2b035ac4d..14fdedfec 100644 --- a/src/main/kotlin/org/opensearch/observability/model/SavedQuery.kt +++ b/src/main/kotlin/org/opensearch/observability/model/SavedQuery.kt @@ -8,11 +8,11 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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 index 608546c5c..f71dd0e7b 100644 --- a/src/main/kotlin/org/opensearch/observability/model/SavedVisualization.kt +++ b/src/main/kotlin/org/opensearch/observability/model/SavedVisualization.kt @@ -8,11 +8,11 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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/ScheduledJobDoc.kt b/src/main/kotlin/org/opensearch/observability/model/ScheduledJobDoc.kt index 42ba7b786..aa2cfad01 100644 --- a/src/main/kotlin/org/opensearch/observability/model/ScheduledJobDoc.kt +++ b/src/main/kotlin/org/opensearch/observability/model/ScheduledJobDoc.kt @@ -1,11 +1,11 @@ package org.opensearch.observability.model import org.opensearch.common.io.stream.StreamOutput -import org.opensearch.common.xcontent.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser import org.opensearch.jobscheduler.spi.ScheduledJobParameter import org.opensearch.jobscheduler.spi.schedule.Schedule import org.opensearch.jobscheduler.spi.schedule.ScheduleParser diff --git a/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt b/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt index 4ce5ae143..c2afc8a90 100644 --- a/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt +++ b/src/main/kotlin/org/opensearch/observability/model/SearchResults.kt @@ -12,10 +12,10 @@ 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.ToXContent.Params -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent.Params +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser import org.opensearch.search.SearchHit internal abstract class SearchResults : BaseModel { diff --git a/src/main/kotlin/org/opensearch/observability/model/Timestamp.kt b/src/main/kotlin/org/opensearch/observability/model/Timestamp.kt index da4ef689c..1f923b850 100644 --- a/src/main/kotlin/org/opensearch/observability/model/Timestamp.kt +++ b/src/main/kotlin/org/opensearch/observability/model/Timestamp.kt @@ -8,11 +8,11 @@ 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.ToXContent -import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentParserUtils +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentBuilder +import org.opensearch.core.xcontent.XContentParser 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/XParser.kt b/src/main/kotlin/org/opensearch/observability/model/XParser.kt index 5944bafd9..560025ee1 100644 --- a/src/main/kotlin/org/opensearch/observability/model/XParser.kt +++ b/src/main/kotlin/org/opensearch/observability/model/XParser.kt @@ -5,7 +5,7 @@ package org.opensearch.observability.model -import org.opensearch.common.xcontent.XContentParser +import org.opensearch.core.xcontent.XContentParser /** * Functional interface to create object using XContentParser diff --git a/src/main/kotlin/org/opensearch/observability/resthandler/RestResponseToXContentListener.kt b/src/main/kotlin/org/opensearch/observability/resthandler/RestResponseToXContentListener.kt index 989416e8a..e90b69c7a 100644 --- a/src/main/kotlin/org/opensearch/observability/resthandler/RestResponseToXContentListener.kt +++ b/src/main/kotlin/org/opensearch/observability/resthandler/RestResponseToXContentListener.kt @@ -5,7 +5,7 @@ package org.opensearch.observability.resthandler -import org.opensearch.common.xcontent.XContentBuilder +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/scheduler/ObservabilityJobParser.kt b/src/main/kotlin/org/opensearch/observability/scheduler/ObservabilityJobParser.kt index 0278f58a9..b0dd7b70b 100644 --- a/src/main/kotlin/org/opensearch/observability/scheduler/ObservabilityJobParser.kt +++ b/src/main/kotlin/org/opensearch/observability/scheduler/ObservabilityJobParser.kt @@ -5,7 +5,7 @@ package org.opensearch.observability.scheduler -import org.opensearch.common.xcontent.XContentParser +import org.opensearch.core.xcontent.XContentParser import org.opensearch.jobscheduler.spi.JobDocVersion import org.opensearch.jobscheduler.spi.ScheduledJobParameter import org.opensearch.jobscheduler.spi.ScheduledJobParser diff --git a/src/main/kotlin/org/opensearch/observability/util/Helpers.kt b/src/main/kotlin/org/opensearch/observability/util/Helpers.kt index f77c0643f..738b3fa8a 100644 --- a/src/main/kotlin/org/opensearch/observability/util/Helpers.kt +++ b/src/main/kotlin/org/opensearch/observability/util/Helpers.kt @@ -8,15 +8,15 @@ 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.DeprecationHandler -import org.opensearch.common.xcontent.NamedXContentRegistry -import org.opensearch.common.xcontent.ToXContent -import org.opensearch.common.xcontent.ToXContentObject -import org.opensearch.common.xcontent.XContentBuilder -import org.opensearch.common.xcontent.XContentParser -import org.opensearch.common.xcontent.XContentParser.Token import org.opensearch.common.xcontent.XContentParserUtils import org.opensearch.common.xcontent.XContentType +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.rest.RestRequest internal fun StreamInput.createJsonParser(): XContentParser { diff --git a/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt b/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt index f45e795e6..ba835ea15 100644 --- a/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt +++ b/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt @@ -18,11 +18,11 @@ import org.opensearch.client.RestClient import org.opensearch.client.WarningsHandler import org.opensearch.common.io.PathUtils import org.opensearch.common.settings.Settings -import org.opensearch.common.xcontent.DeprecationHandler -import org.opensearch.common.xcontent.NamedXContentRegistry import org.opensearch.common.xcontent.XContentType import org.opensearch.commons.ConfigConstants import org.opensearch.commons.rest.SecureRestClientBuilder +import org.opensearch.core.xcontent.DeprecationHandler +import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.test.rest.OpenSearchRestTestCase import java.io.BufferedReader import java.io.IOException diff --git a/src/test/kotlin/org/opensearch/observability/TestHelpers.kt b/src/test/kotlin/org/opensearch/observability/TestHelpers.kt index 5c65483d0..7815ccaeb 100644 --- a/src/test/kotlin/org/opensearch/observability/TestHelpers.kt +++ b/src/test/kotlin/org/opensearch/observability/TestHelpers.kt @@ -8,12 +8,12 @@ package org.opensearch.observability import com.google.gson.JsonObject import com.google.gson.JsonParser import org.junit.Assert -import org.opensearch.common.xcontent.DeprecationHandler -import org.opensearch.common.xcontent.NamedXContentRegistry -import org.opensearch.common.xcontent.ToXContent import org.opensearch.common.xcontent.XContentFactory -import org.opensearch.common.xcontent.XContentParser import org.opensearch.common.xcontent.XContentType +import org.opensearch.core.xcontent.DeprecationHandler +import org.opensearch.core.xcontent.NamedXContentRegistry +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.XContentParser import org.opensearch.observability.model.ObservabilityObjectDoc import org.opensearch.observability.model.ObservabilityObjectType import org.opensearch.observability.model.Timestamp