From 16c3b54639fedf2f5c804c91177f489a021bc235 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Thu, 11 Mar 2021 12:38:20 -0800 Subject: [PATCH] [Rename] refactor o.e.script package in server module. (#250) Refactor the package`org.elasticsearch.script` in server module to rename it to`org.opensearch.script`. Signed-off-by: Rabi Panda --- .../java/org/elasticsearch/client/CrudIT.java | 4 +- .../client/RequestConvertersTests.java | 4 +- .../org/elasticsearch/client/SearchIT.java | 4 +- .../elasticsearch/client/StoredScriptsIT.java | 4 +- .../elasticsearch/client/UpdateByQueryIT.java | 2 +- .../documentation/CRUDDocumentationIT.java | 4 +- .../QueryDSLDocumentationTests.java | 4 +- .../documentation/SearchDocumentationIT.java | 2 +- .../StoredScriptsDocumentationIT.java | 4 +- .../support/ArrayValuesSourceParser.java | 2 +- .../stats/InternalMatrixStatsTests.java | 2 +- .../common/AnalysisPainlessExtension.java | 2 +- .../common/AnalysisPredicateScript.java | 2 +- .../analysis/common/CommonAnalysisPlugin.java | 4 +- .../PredicateTokenFilterScriptFactory.java | 6 +-- .../ScriptedConditionTokenFilterFactory.java | 6 +-- .../PredicateTokenScriptFilterTests.java | 6 +-- .../ScriptedConditionTokenFilterTests.java | 6 +-- .../ingest/common/IngestRestartIT.java | 4 +- .../ingest/common/AppendProcessor.java | 4 +- .../ingest/common/DateIndexNameProcessor.java | 4 +- .../ingest/common/DateProcessor.java | 4 +- .../ingest/common/FailProcessor.java | 4 +- .../ingest/common/ForEachProcessor.java | 2 +- .../common/ProcessorsWhitelistExtension.java | 4 +- .../ingest/common/RemoveProcessor.java | 4 +- .../ingest/common/RenameProcessor.java | 4 +- .../ingest/common/ScriptProcessor.java | 12 +++--- .../ingest/common/SetProcessor.java | 4 +- .../ingest/common/DateProcessorTests.java | 2 +- .../common/ForEachProcessorFactoryTests.java | 2 +- .../ingest/common/ForEachProcessorTests.java | 2 +- .../common/ScriptProcessorFactoryTests.java | 14 +++---- .../ingest/common/ScriptProcessorTests.java | 12 +++--- .../script/expression/MoreExpressionIT.java | 4 +- .../script/expression/StoredExpressionIT.java | 4 +- .../ExpressionAggregationScript.java | 4 +- .../expression/ExpressionFieldScript.java | 4 +- .../ExpressionNumberSortScript.java | 4 +- .../script/expression/ExpressionPlugin.java | 4 +- .../expression/ExpressionScoreScript.java | 4 +- .../expression/ExpressionScriptEngine.java | 24 +++++------ .../ExpressionTermSetQueryScript.java | 4 +- .../plugin-metadata/plugin-security.policy | 14 +++---- .../ExpressionFieldScriptTests.java | 4 +- .../ExpressionNumberSortScriptTests.java | 4 +- .../ExpressionTermsSetQueryTests.java | 4 +- .../mustache/MultiSearchTemplateIT.java | 2 +- .../script/mustache/SearchTemplateIT.java | 2 +- .../script/mustache/MustachePlugin.java | 4 +- .../script/mustache/MustacheScriptEngine.java | 12 +++--- .../RestRenderSearchTemplateAction.java | 2 +- .../mustache/SearchTemplateRequest.java | 2 +- .../SearchTemplateRequestBuilder.java | 2 +- .../TransportMultiSearchTemplateAction.java | 2 +- .../TransportSearchTemplateAction.java | 8 ++-- .../mustache/CustomMustacheFactoryTests.java | 6 +-- .../MultiSearchTemplateRequestTests.java | 2 +- .../mustache/MustacheScriptEngineTests.java | 4 +- .../script/mustache/MustacheTests.java | 6 +-- .../mustache/SearchTemplateRequestTests.java | 2 +- .../SearchTemplateRequestXContentTests.java | 2 +- .../painless/spi/PainlessExtension.java | 2 +- .../opensearch/painless/AnalyzerCaster.java | 2 +- .../java/org/opensearch/painless/Def.java | 2 +- .../org/opensearch/painless/MethodWriter.java | 2 +- .../painless/PainlessExplainError.java | 2 +- .../opensearch/painless/PainlessPlugin.java | 10 ++--- .../opensearch/painless/PainlessScript.java | 2 +- .../painless/PainlessScriptEngine.java | 6 +-- .../java/org/opensearch/painless/Utility.java | 2 +- .../opensearch/painless/WriterConstants.java | 2 +- .../action/PainlessContextAction.java | 2 +- .../painless/action/PainlessContextInfo.java | 2 +- .../action/PainlessExecuteAction.java | 12 +++--- .../phase/PainlessUserTreeToIRTreePhase.java | 2 +- .../painless/AugmentationTests.java | 2 +- .../opensearch/painless/BaseClassTests.java | 2 +- .../painless/BasicStatementTests.java | 2 +- .../opensearch/painless/BindingsTests.java | 2 +- .../org/opensearch/painless/DebugTests.java | 2 +- .../painless/DocFieldsPhaseTests.java | 2 +- .../org/opensearch/painless/FactoryTests.java | 8 ++-- .../opensearch/painless/NeedsScoreTests.java | 4 +- .../org/opensearch/painless/RegexTests.java | 2 +- .../opensearch/painless/ScriptTestCase.java | 4 +- .../ScriptedMetricAggContextsTests.java | 4 +- .../painless/SimilarityScriptTests.java | 6 +-- .../painless/WhenThingsGoWrongTests.java | 2 +- .../action/PainlessExecuteApiTests.java | 8 ++-- .../action/PainlessExecuteRequestTests.java | 6 +-- .../spi/org.elasticsearch.painless.test | 2 +- .../opensearch/join/query/InnerHitsIT.java | 8 ++-- .../PercolatorFieldMapperTests.java | 4 +- .../PercolatorQuerySearchTests.java | 6 +-- .../index/rankeval/RankEvalSpec.java | 2 +- .../rankeval/TransportRankEvalAction.java | 6 +-- .../index/rankeval/RankEvalSpecTests.java | 4 +- .../TransportRankEvalActionTests.java | 2 +- .../documentation/ReindexDocumentationIT.java | 4 +- .../AbstractAsyncBulkByScrollAction.java | 6 +-- .../reindex/AsyncDeleteByQueryAction.java | 2 +- .../index/reindex/ReindexPlugin.java | 2 +- .../opensearch/index/reindex/Reindexer.java | 4 +- .../reindex/RestUpdateByQueryAction.java | 2 +- .../reindex/TransportDeleteByQueryAction.java | 2 +- .../index/reindex/TransportReindexAction.java | 2 +- .../reindex/TransportUpdateByQueryAction.java | 4 +- ...AsyncBulkByScrollActionScriptTestCase.java | 4 +- .../ReindexFromRemoteWithAuthTests.java | 2 +- .../index/reindex/ReindexScriptTests.java | 2 +- .../index/reindex/RoundTripTests.java | 4 +- .../reindex/UpdateByQueryWithScriptTests.java | 2 +- .../org/opensearch/systemd/SystemdPlugin.java | 2 +- .../elasticsearch/OpenSearchException.java | 6 +-- .../action/search/SearchRequestBuilder.java | 2 +- .../action/update/UpdateHelper.java | 6 +-- .../action/update/UpdateRequest.java | 4 +- .../action/update/UpdateRequestBuilder.java | 2 +- .../elasticsearch/cluster/ClusterModule.java | 2 +- .../metadata/MetadataIndexUpgradeService.java | 2 +- .../common/io/stream/StreamInput.java | 2 +- .../common/io/stream/StreamOutput.java | 2 +- .../search/function/ScriptScoreFunction.java | 6 +-- .../search/function/ScriptScoreQuery.java | 6 +-- .../common/settings/ClusterSettings.java | 2 +- .../xcontent/XContentOpenSearchExtension.java | 2 +- .../org/elasticsearch/index/IndexModule.java | 2 +- .../org/elasticsearch/index/IndexService.java | 2 +- .../index/fielddata/ScriptDocValues.java | 2 +- .../index/mapper/DocumentMapperParser.java | 2 +- .../elasticsearch/index/mapper/Mapper.java | 2 +- .../index/mapper/MapperService.java | 2 +- .../index/query/InnerHitBuilder.java | 2 +- .../index/query/InnerHitContextBuilder.java | 2 +- .../index/query/IntervalFilterScript.java | 4 +- .../index/query/IntervalsSourceProvider.java | 2 +- .../index/query/QueryBuilders.java | 2 +- .../index/query/QueryShardContext.java | 8 ++-- .../index/query/ScriptQueryBuilder.java | 4 +- .../index/query/TermsSetQueryBuilder.java | 4 +- .../functionscore/ScoreFunctionBuilders.java | 6 +-- .../ScriptScoreFunctionBuilder.java | 4 +- .../ScriptScoreQueryBuilder.java | 4 +- .../AbstractBulkIndexByScrollRequest.java | 2 +- ...stractBulkIndexByScrollRequestBuilder.java | 2 +- .../index/reindex/ReindexRequest.java | 2 +- .../index/similarity/ScriptedSimilarity.java | 4 +- .../ScriptedSimilarityProvider.java | 8 ++-- .../index/similarity/SimilarityService.java | 2 +- .../elasticsearch/indices/IndicesService.java | 2 +- .../org/elasticsearch/plugins/Plugin.java | 2 +- .../elasticsearch/plugins/ScriptPlugin.java | 4 +- .../elasticsearch/search/SearchService.java | 4 +- .../aggregations/InternalAggregation.java | 2 +- .../PipelineAggregatorBuilders.java | 2 +- .../CompositeValuesSourceBuilder.java | 2 +- .../CompositeValuesSourceParserHelper.java | 2 +- .../DateHistogramValuesSourceBuilder.java | 2 +- .../composite/TermsValuesSourceBuilder.java | 2 +- .../range/IpRangeAggregationBuilder.java | 2 +- .../terms/heuristic/ScriptHeuristic.java | 4 +- .../metrics/InternalScriptedMetric.java | 4 +- .../ScriptedMetricAggregationBuilder.java | 4 +- .../metrics/ScriptedMetricAggregator.java | 6 +-- .../ScriptedMetricAggregatorFactory.java | 4 +- .../metrics/TopHitsAggregationBuilder.java | 4 +- ...ucketScriptPipelineAggregationBuilder.java | 2 +- .../BucketScriptPipelineAggregator.java | 4 +- ...ketSelectorPipelineAggregationBuilder.java | 2 +- .../BucketSelectorPipelineAggregator.java | 4 +- .../MovFnPipelineAggregationBuilder.java | 2 +- .../pipeline/MovFnPipelineAggregator.java | 2 +- .../pipeline/MovingFunctionScript.java | 4 +- .../support/CoreValuesSourceType.java | 2 +- .../support/MultiValuesSourceFieldConfig.java | 2 +- .../aggregations/support/ValuesSource.java | 2 +- .../ValuesSourceAggregationBuilder.java | 2 +- .../support/ValuesSourceConfig.java | 4 +- .../support/ValuesSourceType.java | 2 +- .../support/values/ScriptBytesValues.java | 2 +- .../support/values/ScriptDoubleValues.java | 4 +- .../support/values/ScriptLongValues.java | 4 +- .../search/builder/SearchSourceBuilder.java | 2 +- .../fetch/subphase/ScriptFieldsContext.java | 2 +- .../fetch/subphase/ScriptFieldsPhase.java | 2 +- .../search/sort/ScriptSortBuilder.java | 6 +-- .../search/sort/SortBuilders.java | 2 +- .../suggest/phrase/PhraseSuggester.java | 2 +- .../phrase/PhraseSuggestionBuilder.java | 6 +-- .../phrase/PhraseSuggestionContext.java | 2 +- .../admin/cluster/node/stats/NodeStats.java | 4 +- .../GetScriptContextResponse.java | 2 +- .../GetScriptLanguageResponse.java | 2 +- .../GetStoredScriptResponse.java | 2 +- .../storedscripts/PutStoredScriptRequest.java | 2 +- .../TransportDeleteStoredScriptAction.java | 2 +- .../TransportGetScriptContextAction.java | 4 +- .../TransportGetScriptLanguageAction.java | 2 +- .../TransportGetStoredScriptAction.java | 2 +- .../TransportPutStoredScriptAction.java | 2 +- .../cluster/RestPutStoredScriptAction.java | 2 +- .../rest/action/cat/RestNodesAction.java | 2 +- .../script/AbstractSortScript.java | 2 +- .../script/AggregationScript.java | 2 +- .../script/BucketAggregationScript.java | 2 +- .../BucketAggregationSelectorScript.java | 2 +- .../script/ClassPermission.java | 10 ++--- .../script/DynamicMap.java | 2 +- .../script/ExplainableScoreScript.java | 23 +---------- .../script/FieldScript.java | 2 +- .../script/FilterScript.java | 2 +- .../script/GeneralScriptException.java | 2 +- .../script/IngestConditionalScript.java | 2 +- .../script/IngestScript.java | 2 +- .../script/JodaCompatibleZonedDateTime.java | 2 +- .../script/NumberSortScript.java | 2 +- .../script/ScoreScript.java | 2 +- .../script/ScoreScriptUtils.java | 2 +- .../script/Script.java | 2 +- .../script/ScriptCache.java | 2 +- .../script/ScriptCacheStats.java | 2 +- .../script/ScriptContext.java | 2 +- .../script/ScriptContextInfo.java | 2 +- .../script/ScriptContextStats.java | 2 +- .../script/ScriptEngine.java | 2 +- .../script/ScriptException.java | 40 +++++++++---------- .../script/ScriptFactory.java | 2 +- .../script/ScriptLanguagesInfo.java | 2 +- .../script/ScriptMetadata.java | 2 +- .../script/ScriptMetrics.java | 2 +- .../script/ScriptModule.java | 2 +- .../script/ScriptService.java | 4 +- .../script/ScriptStats.java | 2 +- .../script/ScriptType.java | 2 +- .../script/ScriptedMetricAggContexts.java | 2 +- .../SignificantTermsHeuristicScoreScript.java | 2 +- .../script/SimilarityScript.java | 2 +- .../script/SimilarityWeightScript.java | 2 +- .../script/StoredScriptSource.java | 2 +- .../script/StringSortScript.java | 2 +- .../script/TemplateScript.java | 2 +- .../script/TermsSetQueryScript.java | 2 +- .../script/UpdateScript.java | 2 +- .../script/package-info.java | 2 +- .../common/io/stream/BytesStreamsTests.java | 2 +- .../elasticsearch/index/IndexModuleTests.java | 2 +- .../FilterIntervalsSourceProviderTests.java | 4 +- .../index/query/InnerHitBuilderTests.java | 4 +- .../query/IntervalQueryBuilderTests.java | 8 ++-- .../index/query/ScriptQueryBuilderTests.java | 6 +-- .../query/ScriptScoreQueryBuilderTests.java | 6 +-- .../query/TermsSetQueryBuilderTests.java | 8 ++-- .../FunctionScoreQueryBuilderTests.java | 6 +-- .../ScoreFunctionBuilderTests.java | 2 +- .../similarity/ScriptedSimilarityTests.java | 4 +- .../search/SearchServiceTests.java | 8 ++-- .../AggregationTestScriptsPlugin.java | 6 +-- .../AggregatorFactoriesTests.java | 2 +- .../bucket/DateScriptMocksPlugin.java | 2 +- .../CompositeAggregationBuilderTests.java | 2 +- ...egacyIntervalCompositeAggBuilderTests.java | 2 +- .../InternalVariableWidthHistogramTests.java | 2 +- .../missing/MissingAggregatorTests.java | 12 +++--- .../bucket/nested/NestedAggregatorTests.java | 12 +++--- .../bucket/terms/TermsAggregatorTests.java | 12 +++--- .../metrics/AvgAggregatorTests.java | 12 +++--- .../metrics/InternalScriptedMetricTests.java | 12 +++--- .../metrics/MaxAggregatorTests.java | 12 +++--- ...edianAbsoluteDeviationAggregatorTests.java | 12 +++--- .../metrics/MetricAggScriptPlugin.java | 2 +- .../metrics/MinAggregatorTests.java | 12 +++--- .../ScriptedMetricAggregatorTests.java | 12 +++--- .../metrics/ScriptedMetricTests.java | 4 +- .../metrics/StatsAggregatorTests.java | 12 +++--- .../metrics/SumAggregatorTests.java | 12 +++--- .../metrics/ValueCountAggregatorTests.java | 12 +++--- .../pipeline/BucketScriptAggregatorTests.java | 12 +++--- ...ScriptPipelineAggregationBuilderTests.java | 4 +- .../pipeline/BucketScriptTests.java | 4 +- .../pipeline/BucketSelectorTests.java | 6 +-- .../pipeline/MovFnAggrgatorTests.java | 12 +++--- ...eAggregationBuilderSerializationTests.java | 2 +- .../MultiValuesSourceFieldConfigTests.java | 2 +- .../support/ScriptValuesTests.java | 2 +- .../support/ValuesSourceRegistryTests.java | 2 +- .../search/query/ScriptScoreQueryTests.java | 4 +- .../search/sort/AbstractSortTestCase.java | 8 ++-- .../search/sort/ScriptSortBuilderTests.java | 4 +- .../AbstractSuggestionBuilderTestCase.java | 4 +- .../phrase/PhraseSuggestionBuilderTests.java | 2 +- .../script/ClassPermissionTests.java | 10 ++--- .../JodaCompatibleZonedDateTimeTests.java | 2 +- .../script/ScriptCacheTests.java | 2 +- .../script/ScriptContextInfoTests.java | 16 ++++---- .../script/ScriptContextTests.java | 2 +- .../script/ScriptExceptionTests.java | 2 +- .../script/ScriptLanguagesInfoTests.java | 2 +- .../script/ScriptMetadataTests.java | 2 +- .../script/ScriptServiceTests.java | 14 +++---- .../script/ScriptTests.java | 2 +- .../script/StoredScriptSourceTests.java | 2 +- .../script/StoredScriptTests.java | 2 +- .../snapshots/SnapshotResiliencyTests.java | 2 +- .../index/mapper/MapperServiceTestCase.java | 4 +- .../ingest/TestTemplateService.java | 12 +++--- .../java/org/elasticsearch/node/MockNode.java | 8 ++-- .../search/MockSearchService.java | 2 +- .../search/RandomSearchRequestGenerator.java | 4 +- .../aggregations/AggregatorTestCase.java | 2 +- .../test/AbstractBuilderTestCase.java | 12 +++--- .../elasticsearch/test/ESIntegTestCase.java | 4 +- .../test/ESSingleNodeTestCase.java | 2 +- .../org/elasticsearch/test/ESTestCase.java | 6 +-- .../test/InternalAggregationTestCase.java | 2 +- .../test/InternalTestCluster.java | 4 +- .../script/MockDeterministicScript.java | 2 +- .../script/MockScriptEngine.java | 2 +- .../script/MockScriptPlugin.java | 2 +- .../script/MockScriptService.java | 2 +- .../script/ScoreAccessor.java | 2 +- 321 files changed, 650 insertions(+), 669 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/script/AbstractSortScript.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/AggregationScript.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/BucketAggregationScript.java (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/BucketAggregationSelectorScript.java (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ClassPermission.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/DynamicMap.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ExplainableScoreScript.java (61%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/FieldScript.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/FilterScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/GeneralScriptException.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/IngestConditionalScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/IngestScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/JodaCompatibleZonedDateTime.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/NumberSortScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScoreScript.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScoreScriptUtils.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/Script.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptCache.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptCacheStats.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptContext.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptContextInfo.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptContextStats.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptEngine.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptException.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptFactory.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptLanguagesInfo.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptMetadata.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptMetrics.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptModule.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptService.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptStats.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptType.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/ScriptedMetricAggContexts.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/SignificantTermsHeuristicScoreScript.java (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/SimilarityScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/SimilarityWeightScript.java (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/StoredScriptSource.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/StringSortScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/TemplateScript.java (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/TermsSetQueryScript.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/UpdateScript.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/script/package-info.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ClassPermissionTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/JodaCompatibleZonedDateTimeTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptCacheTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptContextInfoTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptContextTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptExceptionTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptLanguagesInfoTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptMetadataTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptServiceTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/ScriptTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/StoredScriptSourceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/script/StoredScriptTests.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/script/MockDeterministicScript.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/script/MockScriptEngine.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/script/MockScriptPlugin.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/script/MockScriptService.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/script/ScoreAccessor.java (98%) diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java index 724a7c4d118..4c9ddb82857 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java @@ -62,8 +62,8 @@ import org.opensearch.rest.action.document.RestGetAction; import org.opensearch.rest.action.document.RestIndexAction; import org.opensearch.rest.action.document.RestMultiGetAction; import org.opensearch.rest.action.document.RestUpdateAction; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java index 01e26310337..5e28d09ecdb 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java @@ -88,8 +88,8 @@ import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.opensearch.script.mustache.MultiSearchTemplateRequest; import org.opensearch.script.mustache.SearchTemplateRequest; import org.elasticsearch.search.Scroll; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java index 644f4398e27..248079a75ee 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java @@ -52,8 +52,8 @@ import org.opensearch.join.aggregations.Children; import org.opensearch.join.aggregations.ChildrenAggregationBuilder; import org.opensearch.rest.RestStatus; import org.opensearch.rest.action.document.RestIndexAction; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.opensearch.script.mustache.MultiSearchTemplateRequest; import org.opensearch.script.mustache.MultiSearchTemplateResponse; import org.opensearch.script.mustache.MultiSearchTemplateResponse.Item; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java index 7a359a8195b..f4e50bd040d 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java @@ -26,8 +26,8 @@ import org.opensearch.action.admin.cluster.storedscripts.PutStoredScriptRequest; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.StoredScriptSource; +import org.opensearch.script.Script; +import org.opensearch.script.StoredScriptSource; import java.util.Collections; import java.util.Map; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/UpdateByQueryIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/UpdateByQueryIT.java index e2825ad5117..7268775481e 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/UpdateByQueryIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/UpdateByQueryIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.opensearch.tasks.RawTaskStatus; import org.opensearch.tasks.TaskId; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java index d3691a679f8..2f967b57b5c 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java @@ -82,8 +82,8 @@ import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.opensearch.tasks.TaskId; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java index eafe76f1acd..a1a443d46be 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java @@ -30,8 +30,8 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder; import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder; import org.opensearch.join.query.JoinQueryBuilders; import org.elasticsearch.index.query.RankFeatureQueryBuilders; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java index fb8a1829999..10ca7de5b12 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java @@ -74,7 +74,7 @@ import org.opensearch.index.rankeval.RatedDocument; import org.opensearch.index.rankeval.RatedRequest; import org.opensearch.index.rankeval.RatedSearchHit; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import org.opensearch.script.mustache.MultiSearchTemplateRequest; import org.opensearch.script.mustache.MultiSearchTemplateResponse; import org.opensearch.script.mustache.MultiSearchTemplateResponse.Item; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java index f6e6ddd6db7..9fce8526d8a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.StoredScriptSource; +import org.opensearch.script.Script; +import org.opensearch.script.StoredScriptSource; import java.io.IOException; import java.util.Collections; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java index 5beacc88cac..987693a5cbb 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java @@ -22,7 +22,7 @@ package org.opensearch.search.aggregations.support; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.AggregationBuilder.CommonFields; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; diff --git a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java index cae09c3b9d4..fb4c6bb16ba 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.ParsedAggregation; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java index 48687801888..29ddb59a17a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.opensearch.painless.spi.PainlessExtension; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.spi.WhitelistLoader; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.util.Collections; import java.util.List; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java index 3ad5f908a75..e41efd62642 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.apache.lucene.util.AttributeSource; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; /** * A predicate based on the current token in a TokenStream diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java index ed8b0ffef81..05077099156 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java @@ -137,8 +137,8 @@ import org.elasticsearch.plugins.AnalysisPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.ScriptPlugin; import org.elasticsearch.repositories.RepositoriesService; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; import org.tartarus.snowball.ext.DutchStemmer; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java index cddbfe39fe6..a25e8093678 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java @@ -24,9 +24,9 @@ import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import java.io.IOException; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java index 590f4cc7836..08fa4af1774 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java @@ -27,9 +27,9 @@ import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.CharFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java index 7a6060d5ae8..073f9985860 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java @@ -28,9 +28,9 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptService; import org.elasticsearch.test.ESTokenStreamTestCase; import org.elasticsearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java index 223b858e847..0a395f07be9 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java @@ -28,9 +28,9 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptService; import org.elasticsearch.test.ESTokenStreamTestCase; import org.elasticsearch.test.IndexSettingsModule; diff --git a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java index e4ef2368178..31055a3c744 100644 --- a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java +++ b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java @@ -26,8 +26,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.ingest.IngestStats; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.MockScriptPlugin; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.MockScriptPlugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java index 41034678071..d18751422ab 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java @@ -24,8 +24,8 @@ import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.util.Map; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java index 2f8596e72e6..b50456654f4 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java @@ -25,8 +25,8 @@ import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.time.ZoneId; import java.time.ZoneOffset; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java index 88f4f09021b..c8824bec4f6 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java @@ -27,8 +27,8 @@ import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.time.ZoneId; import java.time.ZoneOffset; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java index 8219edc590b..4cbb12d412e 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java @@ -23,8 +23,8 @@ import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.util.Map; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java index 985b19596dd..667ed021e86 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java @@ -24,7 +24,7 @@ import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.WrappingProcessor; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import java.util.ArrayList; import java.util.List; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java index 9415ebf4298..82004c404fb 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java @@ -22,8 +22,8 @@ package org.opensearch.ingest.common; import org.opensearch.painless.spi.PainlessExtension; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.spi.WhitelistLoader; -import org.elasticsearch.script.IngestScript; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.IngestScript; +import org.opensearch.script.ScriptContext; import java.util.Collections; import java.util.List; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java index 8fec4aefb3a..ccd7d0b60fd 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java @@ -23,8 +23,8 @@ import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.util.ArrayList; import java.util.List; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java index 2c275d52be4..152ff80fd1f 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java @@ -23,8 +23,8 @@ import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.util.Map; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java index c30ed217077..82a1aff457a 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java @@ -32,12 +32,12 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.script.DynamicMap; -import org.elasticsearch.script.IngestScript; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.DynamicMap; +import org.opensearch.script.IngestScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptException; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import java.io.InputStream; import java.util.Arrays; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java index c3569e20372..dce08f8b6a5 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java @@ -24,8 +24,8 @@ import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.util.Map; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java index aaca1c94632..429bec28dbd 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java @@ -22,7 +22,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.TestTemplateService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; import java.time.Instant; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java index c80e1843e24..7d5d90aea9a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java @@ -22,7 +22,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.OpenSearchParseException; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.TestProcessor; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java index 0eed1b7333d..48495f43677 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.TestProcessor; import org.elasticsearch.ingest.TestTemplateService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java index de09c49b90f..c150f4fb34f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java @@ -22,13 +22,13 @@ package org.opensearch.ingest.common; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParseException; -import org.elasticsearch.script.IngestScript; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.IngestScript; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptException; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java index 4ae2e11c859..7d15528da18 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java @@ -22,12 +22,12 @@ package org.opensearch.ingest.common; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.script.IngestScript; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.IngestScript; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java index 358e5a6c6e8..9bd31b652dc 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java @@ -31,8 +31,8 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders; import org.elasticsearch.index.query.functionscore.ScriptScoreFunctionBuilder; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java index 9203877c428..e7a8fe9851c 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java @@ -23,8 +23,8 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionAggregationScript.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionAggregationScript.java index ff31a220286..fd538249ec3 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionAggregationScript.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionAggregationScript.java @@ -26,8 +26,8 @@ import org.apache.lucene.expressions.SimpleBindings; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.script.AggregationScript; -import org.elasticsearch.script.GeneralScriptException; +import org.opensearch.script.AggregationScript; +import org.opensearch.script.GeneralScriptException; /** * A bridge to evaluate an {@link Expression} against {@link Bindings} in the context diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionFieldScript.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionFieldScript.java index e79a9ee75f1..fae9981e9f6 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionFieldScript.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionFieldScript.java @@ -24,8 +24,8 @@ import org.apache.lucene.expressions.SimpleBindings; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.script.FieldScript; -import org.elasticsearch.script.GeneralScriptException; +import org.opensearch.script.FieldScript; +import org.opensearch.script.GeneralScriptException; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionNumberSortScript.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionNumberSortScript.java index bd9cb13f68c..c5106e1f274 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionNumberSortScript.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionNumberSortScript.java @@ -26,8 +26,8 @@ import org.apache.lucene.expressions.SimpleBindings; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.script.GeneralScriptException; -import org.elasticsearch.script.NumberSortScript; +import org.opensearch.script.GeneralScriptException; +import org.opensearch.script.NumberSortScript; /** * A bridge to evaluate an {@link Expression} against {@link Bindings} in the context diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java index 3b5113099cd..f198fe32c89 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java @@ -24,8 +24,8 @@ import java.util.Collection; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.ScriptPlugin; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; public class ExpressionPlugin extends Plugin implements ScriptPlugin { diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScoreScript.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScoreScript.java index 51333136dcc..75f5c7130bc 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScoreScript.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScoreScript.java @@ -25,8 +25,8 @@ import org.apache.lucene.expressions.SimpleBindings; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.script.GeneralScriptException; -import org.elasticsearch.script.ScoreScript; +import org.opensearch.script.GeneralScriptException; +import org.opensearch.script.ScoreScript; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java index 73e76f17958..111666bcb2e 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java @@ -32,18 +32,18 @@ import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.GeoPointFieldMapper.GeoPointFieldType; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.script.AggregationScript; -import org.elasticsearch.script.BucketAggregationScript; -import org.elasticsearch.script.BucketAggregationSelectorScript; -import org.elasticsearch.script.ClassPermission; -import org.elasticsearch.script.FieldScript; -import org.elasticsearch.script.FilterScript; -import org.elasticsearch.script.NumberSortScript; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.TermsSetQueryScript; +import org.opensearch.script.AggregationScript; +import org.opensearch.script.BucketAggregationScript; +import org.opensearch.script.BucketAggregationSelectorScript; +import org.opensearch.script.ClassPermission; +import org.opensearch.script.FieldScript; +import org.opensearch.script.FilterScript; +import org.opensearch.script.NumberSortScript; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptException; +import org.opensearch.script.TermsSetQueryScript; import org.elasticsearch.search.lookup.SearchLookup; import java.security.AccessControlContext; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionTermSetQueryScript.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionTermSetQueryScript.java index c01451db1a7..12ea15e3edc 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionTermSetQueryScript.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionTermSetQueryScript.java @@ -26,8 +26,8 @@ import org.apache.lucene.expressions.SimpleBindings; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.script.GeneralScriptException; -import org.elasticsearch.script.TermsSetQueryScript; +import org.opensearch.script.GeneralScriptException; +import org.opensearch.script.TermsSetQueryScript; /** * A bridge to evaluate an {@link Expression} against {@link Bindings} in the context diff --git a/modules/lang-expression/src/main/plugin-metadata/plugin-security.policy b/modules/lang-expression/src/main/plugin-metadata/plugin-security.policy index 4835ab0530e..6e7cf326759 100644 --- a/modules/lang-expression/src/main/plugin-metadata/plugin-security.policy +++ b/modules/lang-expression/src/main/plugin-metadata/plugin-security.policy @@ -20,13 +20,13 @@ grant { // needed to generate runtime classes permission java.lang.RuntimePermission "createClassLoader"; - + // expression runtime - permission org.elasticsearch.script.ClassPermission "java.lang.String"; - permission org.elasticsearch.script.ClassPermission "org.apache.lucene.expressions.Expression"; - permission org.elasticsearch.script.ClassPermission "org.apache.lucene.search.DoubleValues"; + permission org.opensearch.script.ClassPermission "java.lang.String"; + permission org.opensearch.script.ClassPermission "org.apache.lucene.expressions.Expression"; + permission org.opensearch.script.ClassPermission "org.apache.lucene.search.DoubleValues"; // available functions - permission org.elasticsearch.script.ClassPermission "java.lang.Math"; - permission org.elasticsearch.script.ClassPermission "org.apache.lucene.util.MathUtil"; - permission org.elasticsearch.script.ClassPermission "org.apache.lucene.util.SloppyMath"; + permission org.opensearch.script.ClassPermission "java.lang.Math"; + permission org.opensearch.script.ClassPermission "org.apache.lucene.util.MathUtil"; + permission org.opensearch.script.ClassPermission "org.apache.lucene.util.SloppyMath"; }; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java index 4347842033e..98cae12a2d7 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java @@ -24,8 +24,8 @@ import org.elasticsearch.index.fielddata.LeafNumericFieldData; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.script.FieldScript; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.FieldScript; +import org.opensearch.script.ScriptException; import org.elasticsearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java index 92bbd127a6f..0aea0e0af75 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java @@ -28,8 +28,8 @@ import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; -import org.elasticsearch.script.NumberSortScript; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.NumberSortScript; +import org.opensearch.script.ScriptException; import org.elasticsearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java index 89f281fd0ce..7b3f5628bd0 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java @@ -28,8 +28,8 @@ import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.TermsSetQueryScript; +import org.opensearch.script.ScriptException; +import org.opensearch.script.TermsSetQueryScript; import org.elasticsearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java index 8d13d5f565b..21876ff3693 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESIntegTestCase; import java.util.Arrays; diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java index 621b957c584..ac21d50ef1a 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java index 2b0298d6576..71cd50cb1a5 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java @@ -33,8 +33,8 @@ import org.elasticsearch.plugins.ScriptPlugin; import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; import java.util.Arrays; import java.util.Collection; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java index 90df4f33693..09d2f574b81 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java @@ -26,12 +26,12 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.elasticsearch.SpecialPermission; -import org.elasticsearch.script.GeneralScriptException; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.GeneralScriptException; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptException; +import org.opensearch.script.TemplateScript; import java.io.Reader; import java.io.StringReader; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java index a3e5f476927..157161785eb 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import java.io.IOException; import java.util.List; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java index 1612284f5b1..b9235044818 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import java.io.IOException; import java.util.Map; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java index d09e1fe1cf5..3eb1a21e213 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.script.mustache; import org.opensearch.action.ActionRequestBuilder; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.client.OpenSearchClient; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import java.util.Map; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java index e93633d1444..3cd115f33e4 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java @@ -28,7 +28,7 @@ import org.opensearch.action.support.HandledTransportAction; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java index fdd534ba499..d8c9cd213fe 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java @@ -33,10 +33,10 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; +import org.opensearch.script.TemplateScript; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.SearchContext; import org.opensearch.tasks.Task; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java index a532fc4b29a..9cc03e41477 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java @@ -19,9 +19,9 @@ package org.opensearch.script.mustache; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; import java.util.Map; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java index 4016af975d1..8823cab1f7d 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.Scroll; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java index 153c4009803..cd3530835ac 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java @@ -22,8 +22,8 @@ import com.github.mustachejava.MustacheFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.script.TemplateScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.TemplateScript; +import org.opensearch.script.Script; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java index a1d13dc4d82..d32480d9377 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java @@ -21,9 +21,9 @@ package org.opensearch.script.mustache; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptException; +import org.opensearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matcher; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java index 6c0399c2b93..ca3fdd6026f 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java @@ -20,7 +20,7 @@ package org.opensearch.script.mustache; import org.elasticsearch.common.io.stream.Writeable; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.RandomSearchRequestGenerator; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.AbstractWireSerializingTestCase; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java index ac53dd3f12e..1dfccf8f3f9 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentParseException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.AbstractXContentTestCase; import java.io.IOException; diff --git a/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java index c7068d49ca0..724e04023a0 100644 --- a/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java @@ -19,7 +19,7 @@ package org.opensearch.painless.spi; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.util.List; import java.util.Map; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java b/modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java index 02cf44f13c6..8f304fa5d56 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java @@ -22,7 +22,7 @@ package org.opensearch.painless; import org.opensearch.painless.lookup.PainlessCast; import org.opensearch.painless.lookup.PainlessLookupUtility; import org.opensearch.painless.lookup.def; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/Def.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Def.java index d9fedec4740..ea1e422d90d 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/Def.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Def.java @@ -23,7 +23,7 @@ import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.lookup.PainlessLookupUtility; import org.opensearch.painless.lookup.PainlessMethod; import org.opensearch.painless.symbol.FunctionTable; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java b/modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java index 97d6c17356a..3c9b6548255 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java @@ -22,7 +22,7 @@ package org.opensearch.painless; import org.opensearch.painless.lookup.PainlessCast; import org.opensearch.painless.lookup.PainlessMethod; import org.opensearch.painless.lookup.def; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java index e3b2531dae3..c8222eb994a 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java @@ -23,7 +23,7 @@ import org.opensearch.painless.api.Debug; import org.opensearch.painless.lookup.PainlessClass; import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptException; import java.util.List; import java.util.Map; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java index 73d10beb3fe..0aecc048b9c 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java @@ -48,11 +48,11 @@ import org.elasticsearch.plugins.ScriptPlugin; import org.elasticsearch.repositories.RepositoriesService; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; -import org.elasticsearch.script.IngestScript; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.IngestScript; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.pipeline.MovingFunctionScript; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java index 136b32e92be..a1349e797ce 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptException; import java.util.ArrayList; import java.util.BitSet; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java index cb3730636bf..c970288d733 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java @@ -26,9 +26,9 @@ import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.lookup.PainlessLookupBuilder; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.symbol.ScriptScope; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptException; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java index 0e19cfd8577..5c9cac43429 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import java.time.ZonedDateTime; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java b/modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java index 5dfae2b893d..7e8f3f8428b 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.objectweb.asm.Handle; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java index b9844eceeb6..2043be5f044 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java @@ -39,7 +39,7 @@ import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import org.opensearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java index 45c7558dc02..94cf61c5afb 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java @@ -31,7 +31,7 @@ import org.opensearch.painless.lookup.PainlessClassBinding; import org.opensearch.painless.lookup.PainlessInstanceBinding; import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.lookup.PainlessMethod; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java index a016ade9cd6..ae195081dee 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java @@ -72,12 +72,12 @@ import org.elasticsearch.indices.IndicesService; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import org.elasticsearch.script.FilterScript; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.FilterScript; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java index 0787e24dfec..10cc5560c53 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java @@ -53,7 +53,7 @@ import org.opensearch.painless.symbol.Decorations.IRNodeDecoration; import org.opensearch.painless.symbol.Decorations.MethodEscape; import org.opensearch.painless.symbol.FunctionTable.LocalFunction; import org.opensearch.painless.symbol.ScriptScope; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptException; import org.objectweb.asm.Opcodes; import org.objectweb.asm.commons.Method; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java index a5495fa02da..a16f1555dc0 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java @@ -21,7 +21,7 @@ package org.opensearch.painless; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.spi.WhitelistLoader; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java index fc732256752..8a8f309472b 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java @@ -20,7 +20,7 @@ package org.opensearch.painless; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.util.Collections; import java.util.HashMap; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java index 6dc1a630904..d467bcdf1e9 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java @@ -20,7 +20,7 @@ package org.opensearch.painless; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java index 3c0aeb06e07..6bc0c9c6632 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java @@ -22,7 +22,7 @@ package org.opensearch.painless; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.spi.WhitelistInstanceBinding; import org.opensearch.painless.spi.WhitelistLoader; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java index d8fd7203290..20aa8e6433f 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.lookup.PainlessLookupBuilder; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptException; import java.io.IOException; import java.util.Map; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java index 79ccb37c284..279e22cd904 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java @@ -24,7 +24,7 @@ import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.lookup.PainlessLookupBuilder; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.symbol.ScriptScope; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.ScriptContext; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java index b2ee616fa27..00cd3085f8d 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java @@ -20,10 +20,10 @@ package org.opensearch.painless; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.ScriptFactory; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptException; +import org.opensearch.script.ScriptFactory; +import org.opensearch.script.TemplateScript; import java.util.Arrays; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java index a0d542e559a..79127e4328d 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java @@ -23,8 +23,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.NumberSortScript; -import org.elasticsearch.script.ScriptContext; +import org.opensearch.script.NumberSortScript; +import org.opensearch.script.ScriptContext; import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java index 9ea96a9810d..f66756b02d8 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java @@ -20,7 +20,7 @@ package org.opensearch.painless; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptException; import java.nio.CharBuffer; import java.util.Arrays; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java index 3c34762f957..9f9efef36fc 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.settings.Settings; import org.opensearch.painless.antlr.Walker; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.spi.WhitelistLoader; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptException; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java index c830858ee0d..9fd251c1cba 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java @@ -23,8 +23,8 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.memory.MemoryIndex; import org.apache.lucene.search.Scorable; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptedMetricAggContexts; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptedMetricAggContexts; import org.elasticsearch.search.lookup.LeafSearchLookup; import org.elasticsearch.search.lookup.SearchLookup; import org.elasticsearch.search.lookup.SourceLookup; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java index f8b0a723619..7022ceb263d 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java @@ -38,9 +38,9 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.elasticsearch.index.similarity.ScriptedSimilarity; import org.opensearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.SimilarityScript; -import org.elasticsearch.script.SimilarityWeightScript; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.SimilarityScript; +import org.opensearch.script.SimilarityWeightScript; import java.io.IOException; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java index 03d8946cf50..36123e04d74 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java @@ -21,7 +21,7 @@ package org.opensearch.painless; import junit.framework.AssertionFailedError; import org.apache.lucene.util.Constants; -import org.elasticsearch.script.ScriptException; +import org.opensearch.script.ScriptException; import java.lang.invoke.WrongMethodTypeException; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java index fb730c3d144..851b4e31078 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java @@ -27,10 +27,10 @@ import org.opensearch.painless.PainlessPlugin; import org.opensearch.painless.action.PainlessExecuteAction.Request; import org.opensearch.painless.action.PainlessExecuteAction.Response; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptException; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptException; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java index c3636469cb5..a7137b76589 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java @@ -32,9 +32,9 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.opensearch.painless.action.PainlessExecuteAction.Request.ContextSetup; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchModule; import org.elasticsearch.test.AbstractWireSerializingTestCase; diff --git a/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test b/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test index 85493cad22d..824e6d7112f 100644 --- a/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test +++ b/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test @@ -1,7 +1,7 @@ # whitelist for tests # TODO: remove this when the transition from Joda to Java datetimes is completed -class org.elasticsearch.script.JodaCompatibleZonedDateTime { +class org.opensearch.script.JodaCompatibleZonedDateTime { (Instant, ZoneId) } diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java index 1d684bc4ef8..cb087455050 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java @@ -29,10 +29,10 @@ import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.InnerHitBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.MockScriptPlugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.MockScriptPlugin; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java index 9eb9bfeab2a..fa1a83feef2 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java @@ -86,8 +86,8 @@ import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptPlugin; -import org.elasticsearch.script.Script; +import org.opensearch.script.MockScriptPlugin; +import org.opensearch.script.Script; import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.InternalSettingsPlugin; import org.junit.Before; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java index 7489abcb3c4..95edbb95648 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java @@ -36,9 +36,9 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptPlugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptPlugin; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.lookup.LeafDocLookup; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.ESSingleNodeTestCase; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalSpec.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalSpec.java index fffbd0e14b0..03715ddb2dc 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalSpec.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalSpec.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParserUtils; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java index 569b97769d2..5dbe95a2dd7 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java @@ -34,9 +34,9 @@ import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.opensearch.tasks.Task; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java index eda06d0856f..fde329fa97b 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java @@ -32,8 +32,8 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.opensearch.index.rankeval.RankEvalSpec.ScriptWithId; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java index 6801bcb5b52..9ca175aab6d 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.transport.TransportService; diff --git a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java index ae8e62188cd..ee2c1db2830 100644 --- a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java @@ -42,8 +42,8 @@ import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.sort.SortOrder; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java index d242e130dc6..915eabd76e0 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java @@ -54,9 +54,9 @@ import org.elasticsearch.index.reindex.ClientScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.UpdateScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.UpdateScript; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortBuilder; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java index ed68447022d..86b1543edad 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.index.reindex.ScrollableHitSource; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; /** diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java index f2948c5a6fe..1b5615402e7 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java @@ -43,7 +43,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.repositories.RepositoriesService; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java index a7d1db55f55..3a190054b54 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java @@ -57,8 +57,8 @@ import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; import org.opensearch.index.reindex.remote.RemoteScrollableHitSource; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; import java.io.IOException; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java index 43b6cf0a64f..c29390073c9 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java @@ -22,7 +22,7 @@ package org.opensearch.index.reindex; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.rest.RestRequest; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import java.io.IOException; import java.util.HashMap; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java index c5ae4c8263b..f19eb227743 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.DeleteByQueryAction; import org.elasticsearch.index.reindex.DeleteByQueryRequest; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java index 28ee5bd2617..f0ec9148028 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.ReindexRequest; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java index 82961188108..ccd621adbcd 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java @@ -41,8 +41,8 @@ import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java index 9b9f2f898fa..277d19f74eb 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java @@ -28,8 +28,8 @@ import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.opensearch.index.reindex.AbstractAsyncBulkByScrollAction.OpType; import org.opensearch.index.reindex.AbstractAsyncBulkByScrollAction.RequestWrapper; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.UpdateScript; +import org.opensearch.script.ScriptService; +import org.opensearch.script.UpdateScript; import org.junit.Before; import java.util.Collections; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index 8641b78d285..d8a34d0297f 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -51,7 +51,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.repositories.RepositoriesService; import org.opensearch.rest.RestHeaderDefinition; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.elasticsearch.test.ESSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java index 87819fa50ea..fac0cd7f96b 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ReindexRequest; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.mockito.Mockito; import java.util.Map; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java index 43cc5ef1751..23076762a81 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequest; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.opensearch.tasks.TaskId; import org.elasticsearch.test.ESTestCase; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java index 0943eac6b17..f89190a8d1e 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.ActionFilters; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.UpdateByQueryRequest; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.transport.TransportService; import java.util.Collections; diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java index 086b2e1066a..be72b68f021 100644 --- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java @@ -34,7 +34,7 @@ import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.plugins.ClusterPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.repositories.RepositoriesService; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchException.java b/server/src/main/java/org/elasticsearch/OpenSearchException.java index 2ce9fc1f3a8..77da32cea2e 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchException.java +++ b/server/src/main/java/org/elasticsearch/OpenSearchException.java @@ -781,8 +781,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.elasticsearch.index.shard.IndexShardStartedException::new, 23, UNKNOWN_VERSION_ADDED), SEARCH_CONTEXT_MISSING_EXCEPTION(org.elasticsearch.search.SearchContextMissingException.class, org.elasticsearch.search.SearchContextMissingException::new, 24, UNKNOWN_VERSION_ADDED), - GENERAL_SCRIPT_EXCEPTION(org.elasticsearch.script.GeneralScriptException.class, - org.elasticsearch.script.GeneralScriptException::new, 25, UNKNOWN_VERSION_ADDED), + GENERAL_SCRIPT_EXCEPTION(org.opensearch.script.GeneralScriptException.class, + org.opensearch.script.GeneralScriptException::new, 25, UNKNOWN_VERSION_ADDED), // 26 was BatchOperationException SNAPSHOT_CREATION_EXCEPTION(org.opensearch.snapshots.SnapshotCreationException.class, org.opensearch.snapshots.SnapshotCreationException::new, 27, UNKNOWN_VERSION_ADDED), @@ -989,7 +989,7 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.elasticsearch.index.query.QueryShardException::new, 141, UNKNOWN_VERSION_ADDED), NO_LONGER_PRIMARY_SHARD_EXCEPTION(ShardStateAction.NoLongerPrimaryShardException.class, ShardStateAction.NoLongerPrimaryShardException::new, 142, UNKNOWN_VERSION_ADDED), - SCRIPT_EXCEPTION(org.elasticsearch.script.ScriptException.class, org.elasticsearch.script.ScriptException::new, 143, + SCRIPT_EXCEPTION(org.opensearch.script.ScriptException.class, org.opensearch.script.ScriptException::new, 143, UNKNOWN_VERSION_ADDED), NOT_MASTER_EXCEPTION(org.elasticsearch.cluster.NotMasterException.class, org.elasticsearch.cluster.NotMasterException::new, 144, UNKNOWN_VERSION_ADDED), diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index 7dc3d2834da..a4973c77330 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -25,7 +25,7 @@ import org.elasticsearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.Scroll; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index 2e4fef64d5c..f28df2f656e 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -41,9 +41,9 @@ import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.mapper.RoutingFieldMapper; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.UpdateScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.UpdateScript; import org.elasticsearch.search.lookup.SourceLookup; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java index 9b9623e80bc..11e00c33acb 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java @@ -46,8 +46,8 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java index 1848538b9fa..bbcee45c475 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.VersionType; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/cluster/ClusterModule.java b/server/src/main/java/org/elasticsearch/cluster/ClusterModule.java index 0b386ad9f88..7f9b1ea945e 100644 --- a/server/src/main/java/org/elasticsearch/cluster/ClusterModule.java +++ b/server/src/main/java/org/elasticsearch/cluster/ClusterModule.java @@ -76,7 +76,7 @@ import org.elasticsearch.ingest.IngestMetadata; import org.elasticsearch.persistent.PersistentTasksCustomMetadata; import org.elasticsearch.persistent.PersistentTasksNodeService; import org.elasticsearch.plugins.ClusterPlugin; -import org.elasticsearch.script.ScriptMetadata; +import org.opensearch.script.ScriptMetadata; import org.opensearch.snapshots.SnapshotsInfoService; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskResultsService; diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeService.java index cd2e00d8695..93d8da81850 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeService.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.SystemIndices; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import java.util.AbstractMap; import java.util.Collections; diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index e05fa6615bf..832da6f621a 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -42,7 +42,7 @@ import org.elasticsearch.common.text.Text; import org.elasticsearch.common.time.DateUtils; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.joda.time.DateTimeZone; import java.io.ByteArrayInputStream; diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java index dfc53c25194..047feb967b5 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java @@ -43,7 +43,7 @@ import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.text.Text; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.joda.time.DateTimeZone; import org.joda.time.ReadableInstant; diff --git a/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java index f17988283b4..c3e04bdbbee 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java @@ -22,9 +22,9 @@ package org.elasticsearch.common.lucene.search.function; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.Scorable; -import org.elasticsearch.script.ExplainableScoreScript; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.ExplainableScoreScript; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.Script; import org.elasticsearch.Version; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreQuery.java index 8ebd3841ba0..299a9f43133 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreQuery.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreQuery.java @@ -37,9 +37,9 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.search.BulkScorer; import org.apache.lucene.util.Bits; import org.elasticsearch.Version; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.ScoreScript.ExplanationHolder; -import org.elasticsearch.script.Script; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.ScoreScript.ExplanationHolder; +import org.opensearch.script.Script; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java index c479c1018a6..03ab84c657b 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java @@ -111,7 +111,7 @@ import org.elasticsearch.persistent.decider.EnableAssignmentDecider; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.repositories.fs.FsRepository; import org.opensearch.rest.BaseRestHandler; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.SearchService; import org.elasticsearch.search.aggregations.MultiBucketConsumerService; diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/XContentOpenSearchExtension.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentOpenSearchExtension.java index 94d5798ab1a..ed2fbb1278b 100644 --- a/server/src/main/java/org/elasticsearch/common/xcontent/XContentOpenSearchExtension.java +++ b/server/src/main/java/org/elasticsearch/common/xcontent/XContentOpenSearchExtension.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Instant; diff --git a/server/src/main/java/org/elasticsearch/index/IndexModule.java b/server/src/main/java/org/elasticsearch/index/IndexModule.java index 7744d03b069..52088e51a9b 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexModule.java +++ b/server/src/main/java/org/elasticsearch/index/IndexModule.java @@ -61,7 +61,7 @@ import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.indices.recovery.RecoveryState; import org.elasticsearch.plugins.IndexStorePlugin; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java index 8d240161760..ed270e1a3e3 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexService.java +++ b/server/src/main/java/org/elasticsearch/index/IndexService.java @@ -82,7 +82,7 @@ import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.indices.recovery.RecoveryState; import org.elasticsearch.plugins.IndexStorePlugin; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java index 988af6491a9..37405678603 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.time.DateUtils; import org.opensearch.geometry.utils.Geohash; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import java.io.IOException; import java.time.Instant; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java index 3592f308a07..fe2d0068b33 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import java.util.HashMap; import java.util.Iterator; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java index 007b267a30a..fb3db355c38 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityProvider; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import java.util.Map; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java index 53853f1718c..e77102277c6 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -55,7 +55,7 @@ import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.InvalidTypeNameException; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import java.io.Closeable; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java index 44fac46fdb9..63656effd9c 100644 --- a/server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder.ScriptField; import org.elasticsearch.search.collapse.CollapseBuilder; diff --git a/server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java index f7f7bbf2c47..6c2efb84384 100644 --- a/server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.query; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.script.FieldScript; +import org.opensearch.script.FieldScript; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.FetchDocValuesContext; import org.elasticsearch.search.fetch.subphase.FetchFieldsContext; diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java b/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java index 2d0fc99258c..b0bcfa3c8a8 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java @@ -20,8 +20,8 @@ package org.elasticsearch.index.query; import org.apache.lucene.queries.intervals.IntervalIterator; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptFactory; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptFactory; /** * Base class for scripts used as interval filters, see {@link IntervalsSourceProvider.IntervalFilter} diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java index 5ad1ab23101..aeec00ccb88 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java @@ -42,7 +42,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java index 12ed10e7ef4..53d5c0e5cf2 100644 --- a/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java +++ b/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder; import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder; import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder; import org.elasticsearch.indices.TermsLookup; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import java.io.IOException; import java.util.Collection; diff --git a/server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java index 4f6c52355f4..4dd110b4a25 100644 --- a/server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java +++ b/server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java @@ -53,10 +53,10 @@ import org.elasticsearch.index.mapper.ObjectMapper; import org.elasticsearch.index.mapper.TextFieldMapper; import org.elasticsearch.index.query.support.NestedScope; import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptFactory; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptFactory; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.AggregationUsageService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.lookup.SearchLookup; diff --git a/server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java index 378b819629d..5419a08c06a 100644 --- a/server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.FilterScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.FilterScript; +import org.opensearch.script.Script; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java index 3361196f0ca..7bc0a8facbe 100644 --- a/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java @@ -39,8 +39,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.TermsSetQueryScript; +import org.opensearch.script.Script; +import org.opensearch.script.TermsSetQueryScript; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java index 3869cc3a76b..404907b1bed 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.query.functionscore; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import static java.util.Collections.emptyMap; @@ -78,7 +78,7 @@ public class ScoreFunctionBuilders { public static RandomScoreFunctionBuilder randomFunction() { return new RandomScoreFunctionBuilder(); } - + public static WeightBuilder weightFactorFunction(float weight) { return (WeightBuilder)(new WeightBuilder().setWeight(weight)); } diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java index 3d5326d5f3d..4d9444dba07 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java @@ -28,8 +28,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.Script; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java index 7dddbfe0437..4fc51ea1e17 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.query.MatchNoneQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.ScoreScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.ScoreScript; +import org.opensearch.script.Script; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java index 40d2e0cc025..92bf5cdd85e 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.opensearch.tasks.TaskId; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java index e51f8ca9d07..85cdf73245a 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.reindex; import org.opensearch.action.ActionType; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.client.OpenSearchClient; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; public abstract class AbstractBulkIndexByScrollRequestBuilder< Request extends AbstractBulkIndexByScrollRequest, diff --git a/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java index 26f8f91ac06..7c3db78c45e 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java @@ -39,7 +39,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.sort.SortOrder; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java index 7e3efacfa20..1656d9ba0c4 100644 --- a/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java +++ b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java @@ -25,8 +25,8 @@ import org.apache.lucene.search.Explanation; import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.util.SmallFloat; -import org.elasticsearch.script.SimilarityScript; -import org.elasticsearch.script.SimilarityWeightScript; +import org.opensearch.script.SimilarityScript; +import org.opensearch.script.SimilarityWeightScript; /** * A {@link Similarity} implementation that allows scores to be scripted. diff --git a/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java index 190f861f262..0b88cae48a9 100644 --- a/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java +++ b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java @@ -23,10 +23,10 @@ import org.apache.lucene.search.similarities.Similarity; import org.elasticsearch.Version; import org.elasticsearch.common.TriFunction; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.SimilarityScript; -import org.elasticsearch.script.SimilarityWeightScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptService; +import org.opensearch.script.SimilarityScript; +import org.opensearch.script.SimilarityWeightScript; /** Provider of scripted similarities. */ final class ScriptedSimilarityProvider implements TriFunction { diff --git a/server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java index b9c6b439736..796e3a8da7a 100644 --- a/server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java +++ b/server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import java.util.Collections; import java.util.HashMap; diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 18db93e34e9..9ae987db280 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -126,7 +126,7 @@ import org.elasticsearch.node.Node; import org.elasticsearch.plugins.IndexStorePlugin; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.repositories.RepositoriesService; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.internal.AliasFilter; import org.elasticsearch.search.internal.SearchContext; diff --git a/server/src/main/java/org/elasticsearch/plugins/Plugin.java b/server/src/main/java/org/elasticsearch/plugins/Plugin.java index d681cae1768..8ebcb61bf03 100644 --- a/server/src/main/java/org/elasticsearch/plugins/Plugin.java +++ b/server/src/main/java/org/elasticsearch/plugins/Plugin.java @@ -41,7 +41,7 @@ import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.shard.IndexSettingProvider; import org.elasticsearch.repositories.RepositoriesService; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ExecutorBuilder; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; diff --git a/server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java index 384f98609a5..de86240e0ab 100644 --- a/server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java +++ b/server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; /** * An additional extension point for {@link Plugin}s that extends Elasticsearch's scripting functionality. diff --git a/server/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java index 4828037f1ff..3417bc486ee 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchService.java +++ b/server/src/main/java/org/elasticsearch/search/SearchService.java @@ -73,8 +73,8 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; import org.elasticsearch.node.ResponseCollectorService; -import org.elasticsearch.script.FieldScript; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.FieldScript; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.AggregationInitializationException; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.InternalAggregation; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java index 4268e51fdb3..4989009dca1 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; import org.elasticsearch.search.aggregations.support.AggregationPath; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java b/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java index a5f89f82f6b..8a4727d6ff1 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.pipeline.AvgBucketPipelineAggregationBuilder; import org.elasticsearch.search.aggregations.pipeline.BucketScriptPipelineAggregationBuilder; import org.elasticsearch.search.aggregations.pipeline.BucketSelectorPipelineAggregationBuilder; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java index 887012204e1..893b6e4d967 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.support.ValueType; import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java index f10e21501d8..2362747e320 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContent.Params; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.support.ValueType; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java index dde06044531..b53fd6f78d4 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java index 50613aab8c6..987066629d0 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSource; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java index 33e93bfbce0..3f7cd5963b9 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; import org.elasticsearch.search.aggregations.AggregatorFactory; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java index 660fce9327a..e13ad8db8d2 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java @@ -26,8 +26,8 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.SignificantTermsHeuristicScoreScript; +import org.opensearch.script.Script; +import org.opensearch.script.SignificantTermsHeuristicScoreScript; import org.elasticsearch.search.aggregations.InternalAggregation; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetric.java index a00effb924c..90da8370548 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetric.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetric.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptedMetricAggContexts; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptedMetricAggContexts; import org.elasticsearch.search.aggregations.InternalAggregation; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java index ff33a5f5585..dbbfd40f9ba 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java @@ -25,8 +25,8 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptedMetricAggContexts; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptedMetricAggContexts; import org.elasticsearch.search.aggregations.AbstractAggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java index fa8710c3c65..6f203196370 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java @@ -27,9 +27,9 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.util.ObjectArray; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptedMetricAggContexts; -import org.elasticsearch.script.ScriptedMetricAggContexts.MapScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptedMetricAggContexts; +import org.opensearch.script.ScriptedMetricAggContexts.MapScript; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.LeafBucketCollector; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java index 6fe4b7a88e5..ced797814c3 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java @@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.metrics; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptedMetricAggContexts; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptedMetricAggContexts; import org.elasticsearch.search.SearchParseException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java index 1303acebd48..01c9e334787 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java @@ -29,8 +29,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.FieldScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.FieldScript; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.AbstractAggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationInitializationException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilder.java index 60930f76a3a..b125720e4ee 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilder.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregator.java index de1a4302435..7a749be7905 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregator.java @@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.pipeline; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.script.BucketAggregationScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.BucketAggregationScript; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java index bd14b42e5bc..83f8d7888fb 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregator.java index a17e710c754..b1542dcdfdf 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorPipelineAggregator.java @@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.pipeline; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.script.BucketAggregationSelectorScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.BucketAggregationSelectorScript; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregationBuilder.java index 7f4f266efb0..4ac16dd1246 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregationBuilder.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java index 1db9bb5f1a1..cb62ff43c65 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java @@ -22,7 +22,7 @@ package org.elasticsearch.search.aggregations.pipeline; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregations; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovingFunctionScript.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovingFunctionScript.java index 8dae73138b2..bb0abd5f87f 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovingFunctionScript.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovingFunctionScript.java @@ -19,8 +19,8 @@ package org.elasticsearch.search.aggregations.pipeline; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptFactory; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptFactory; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java index 824e8410915..5a44e519e65 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.script.AggregationScript; +import org.opensearch.script.AggregationScript; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.AggregationExecutionException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java index 8b963aee71c..e5afec0f7e3 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.AbstractQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java index 1416b965469..1183b53dda7 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java @@ -45,7 +45,7 @@ import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortingBinaryDocValues; import org.elasticsearch.index.fielddata.SortingNumericDoubleValues; import org.elasticsearch.index.mapper.RangeType; -import org.elasticsearch.script.AggregationScript; +import org.opensearch.script.AggregationScript; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.support.ValuesSource.Bytes.WithScript.BytesValues; import org.elasticsearch.search.aggregations.support.values.ScriptBytesValues; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java index 95eacc3a3ac..4e50c47fc5e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.AbstractAggregationBuilder; import org.elasticsearch.search.aggregations.AggregationInitializationException; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java index 37a1d532133..9325794cc25 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java @@ -25,8 +25,8 @@ import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.AggregationScript; -import org.elasticsearch.script.Script; +import org.opensearch.script.AggregationScript; +import org.opensearch.script.Script; import org.elasticsearch.search.DocValueFormat; import java.time.ZoneId; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java index c10fe9fefd6..e2f14bacd32 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.support; -import org.elasticsearch.script.AggregationScript; +import org.opensearch.script.AggregationScript; import org.elasticsearch.search.DocValueFormat; import java.time.ZoneId; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java index e58cf917a7c..4a47e5dd394 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.lucene.ScorerAware; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortingBinaryDocValues; -import org.elasticsearch.script.AggregationScript; +import org.opensearch.script.AggregationScript; import java.io.IOException; import java.lang.reflect.Array; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java index 9be942c6aa5..a6f796643b4 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java @@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.support.values; import org.apache.lucene.search.Scorable; import org.elasticsearch.common.lucene.ScorerAware; import org.elasticsearch.index.fielddata.SortingNumericDoubleValues; -import org.elasticsearch.script.AggregationScript; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.AggregationScript; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.joda.time.ReadableInstant; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java index 2afa90c1185..31f724d4f3a 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java @@ -22,8 +22,8 @@ import org.apache.lucene.search.Scorable; import org.apache.lucene.util.LongValues; import org.elasticsearch.common.lucene.ScorerAware; import org.elasticsearch.index.fielddata.AbstractSortingNumericDocValues; -import org.elasticsearch.script.AggregationScript; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.AggregationScript; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.joda.time.ReadableInstant; diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 10259b435f1..f5db27a925a 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -40,7 +40,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.Rewriteable; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.SearchExtBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorFactories; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java index 4c1bd4aacb5..2505792498a 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.fetch.subphase; -import org.elasticsearch.script.FieldScript; +import org.opensearch.script.FieldScript; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java index bdfb1223d58..967bf9d8f85 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.fetch.subphase; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.util.CollectionUtils; -import org.elasticsearch.script.FieldScript; +import org.opensearch.script.FieldScript; import org.elasticsearch.search.fetch.FetchContext; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; diff --git a/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index 87fd7b42ef0..d83727f7261 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -49,9 +49,9 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.script.NumberSortScript; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.StringSortScript; +import org.opensearch.script.NumberSortScript; +import org.opensearch.script.Script; +import org.opensearch.script.StringSortScript; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java index 3eae9b8d019..8d472b86e4d 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java +++ b/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.sort; import org.elasticsearch.common.geo.GeoPoint; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.sort.ScriptSortBuilder.ScriptSortType; /** diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java index 10b9333ae78..fbb056f44fa 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.query.AbstractQueryBuilder; import org.elasticsearch.index.query.ParsedQuery; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.TemplateScript; import org.elasticsearch.search.suggest.Suggest.Suggestion; import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry; import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry.Option; diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java index 34c30440731..479c20d3cc8 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java @@ -37,9 +37,9 @@ import org.elasticsearch.index.analysis.ShingleTokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; +import org.opensearch.script.TemplateScript; import org.elasticsearch.search.suggest.SuggestionBuilder; import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionContext.DirectCandidateGenerator; diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java index 84987f30e87..b9b6fd39e98 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Terms; import org.apache.lucene.util.BytesRef; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.TemplateScript; import org.elasticsearch.search.suggest.DirectSpellcheckerSettings; import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java index 7618360249a..5239e4ece15 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java @@ -39,8 +39,8 @@ import org.elasticsearch.monitor.jvm.JvmStats; import org.elasticsearch.monitor.os.OsStats; import org.elasticsearch.monitor.process.ProcessStats; import org.elasticsearch.node.AdaptiveSelectionStats; -import org.elasticsearch.script.ScriptCacheStats; -import org.elasticsearch.script.ScriptStats; +import org.opensearch.script.ScriptCacheStats; +import org.opensearch.script.ScriptStats; import org.opensearch.threadpool.ThreadPoolStats; import org.elasticsearch.transport.TransportStats; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptContextResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptContextResponse.java index 74598c36afe..a38041a9f3b 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptContextResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptContextResponse.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.ScriptContextInfo; +import org.opensearch.script.ScriptContextInfo; import java.io.IOException; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptLanguageResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptLanguageResponse.java index 329310242f5..936679e9863 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptLanguageResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetScriptLanguageResponse.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.ScriptLanguagesInfo; +import org.opensearch.script.ScriptLanguagesInfo; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java index 3d6023af4de..d3bc0d2cfa4 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.StoredScriptSource; +import org.opensearch.script.StoredScriptSource; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java index 89d15a9501d..659096bec52 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.script.StoredScriptSource; +import org.opensearch.script.StoredScriptSource; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java index 5ec87bf3630..c8b2a424e7f 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptContextAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptContextAction.java index b904f984a65..ff7a269d9f9 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptContextAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptContextAction.java @@ -22,8 +22,8 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.script.ScriptContextInfo; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptContextInfo; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptLanguageAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptLanguageAction.java index 6dd4fe20136..98ed64fa394 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptLanguageAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetScriptLanguageAction.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java index 6abc2d70176..f64d6defc33 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java index 1c4fe0ad87c..f4918e9bf42 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java index 2c7e279c33a..a36983a13d9 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import org.elasticsearch.script.StoredScriptSource; +import org.opensearch.script.StoredScriptSource; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java index faf03301e20..2a5090c6d8d 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java @@ -59,7 +59,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActionListener; import org.opensearch.rest.action.RestResponseListener; -import org.elasticsearch.script.ScriptStats; +import org.opensearch.script.ScriptStats; import org.elasticsearch.search.suggest.completion.CompletionStats; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/script/AbstractSortScript.java b/server/src/main/java/org/opensearch/script/AbstractSortScript.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/AbstractSortScript.java rename to server/src/main/java/org/opensearch/script/AbstractSortScript.java index 278b562968a..0a582fa18f0 100644 --- a/server/src/main/java/org/elasticsearch/script/AbstractSortScript.java +++ b/server/src/main/java/org/opensearch/script/AbstractSortScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; diff --git a/server/src/main/java/org/elasticsearch/script/AggregationScript.java b/server/src/main/java/org/opensearch/script/AggregationScript.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/AggregationScript.java rename to server/src/main/java/org/opensearch/script/AggregationScript.java index 6ad40b9e941..d1aa6297482 100644 --- a/server/src/main/java/org/elasticsearch/script/AggregationScript.java +++ b/server/src/main/java/org/opensearch/script/AggregationScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; diff --git a/server/src/main/java/org/elasticsearch/script/BucketAggregationScript.java b/server/src/main/java/org/opensearch/script/BucketAggregationScript.java similarity index 97% rename from server/src/main/java/org/elasticsearch/script/BucketAggregationScript.java rename to server/src/main/java/org/opensearch/script/BucketAggregationScript.java index 89713417353..daa612e290a 100644 --- a/server/src/main/java/org/elasticsearch/script/BucketAggregationScript.java +++ b/server/src/main/java/org/opensearch/script/BucketAggregationScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/BucketAggregationSelectorScript.java b/server/src/main/java/org/opensearch/script/BucketAggregationSelectorScript.java similarity index 97% rename from server/src/main/java/org/elasticsearch/script/BucketAggregationSelectorScript.java rename to server/src/main/java/org/opensearch/script/BucketAggregationSelectorScript.java index a8e2fad7cdc..7cc1fbe1038 100644 --- a/server/src/main/java/org/elasticsearch/script/BucketAggregationSelectorScript.java +++ b/server/src/main/java/org/opensearch/script/BucketAggregationSelectorScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/ClassPermission.java b/server/src/main/java/org/opensearch/script/ClassPermission.java similarity index 94% rename from server/src/main/java/org/elasticsearch/script/ClassPermission.java rename to server/src/main/java/org/opensearch/script/ClassPermission.java index f636a0190c4..10883814873 100644 --- a/server/src/main/java/org/elasticsearch/script/ClassPermission.java +++ b/server/src/main/java/org/opensearch/script/ClassPermission.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.security.BasicPermission; import java.security.Permission; @@ -34,13 +34,13 @@ import java.util.Set; * Examples: *

* Allow permission to {@code java.util.List} - * 

permission org.elasticsearch.script.ClassPermission "java.util.List";
+ * 
permission org.opensearch.script.ClassPermission "java.util.List";
* Allow permission to classes underneath {@code java.util} (and its subpackages such as {@code java.util.zip}) - * 
permission org.elasticsearch.script.ClassPermission "java.util.*";
+ * 
permission org.opensearch.script.ClassPermission "java.util.*";
* Allow permission to standard predefined list of basic classes (see list below) - * 
permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
+ * 
permission org.opensearch.script.ClassPermission "<<STANDARD>>";
* Allow permission to all classes - * 
permission org.elasticsearch.script.ClassPermission "*";
+ * 
permission org.opensearch.script.ClassPermission "*";
*

* Set of classes (allowed by special value <<STANDARD>>): *

    diff --git a/server/src/main/java/org/elasticsearch/script/DynamicMap.java b/server/src/main/java/org/opensearch/script/DynamicMap.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/DynamicMap.java rename to server/src/main/java/org/opensearch/script/DynamicMap.java index 30dc6147072..8476f11df18 100644 --- a/server/src/main/java/org/elasticsearch/script/DynamicMap.java +++ b/server/src/main/java/org/opensearch/script/DynamicMap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.util.Collection; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/ExplainableScoreScript.java b/server/src/main/java/org/opensearch/script/ExplainableScoreScript.java similarity index 61% rename from server/src/main/java/org/elasticsearch/script/ExplainableScoreScript.java rename to server/src/main/java/org/opensearch/script/ExplainableScoreScript.java index d181d8c6784..9966a509ec7 100644 --- a/server/src/main/java/org/elasticsearch/script/ExplainableScoreScript.java +++ b/server/src/main/java/org/opensearch/script/ExplainableScoreScript.java @@ -17,26 +17,7 @@ * under the License. */ -package org.elasticsearch.script; - -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ +package org.opensearch.script; import org.apache.lucene.search.Explanation; @@ -44,7 +25,7 @@ import java.io.IOException; /** * To be implemented by {@link ScoreScript} which can provided an {@link Explanation} of the score - * This is currently not used inside elasticsearch but it is used, see for example here: + * This is currently not used inside opensearch but it is used, see for example here: * https://github.com/elastic/elasticsearch/issues/8561 */ public interface ExplainableScoreScript { diff --git a/server/src/main/java/org/elasticsearch/script/FieldScript.java b/server/src/main/java/org/opensearch/script/FieldScript.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/FieldScript.java rename to server/src/main/java/org/opensearch/script/FieldScript.java index f06f24f5dee..a01fdb975da 100644 --- a/server/src/main/java/org/elasticsearch/script/FieldScript.java +++ b/server/src/main/java/org/opensearch/script/FieldScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.logging.DeprecationLogger; diff --git a/server/src/main/java/org/elasticsearch/script/FilterScript.java b/server/src/main/java/org/opensearch/script/FilterScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/FilterScript.java rename to server/src/main/java/org/opensearch/script/FilterScript.java index 166a2b59ffa..df570113cef 100644 --- a/server/src/main/java/org/elasticsearch/script/FilterScript.java +++ b/server/src/main/java/org/opensearch/script/FilterScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java b/server/src/main/java/org/opensearch/script/GeneralScriptException.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/GeneralScriptException.java rename to server/src/main/java/org/opensearch/script/GeneralScriptException.java index 87d9eddba12..7bbfe32b470 100644 --- a/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java +++ b/server/src/main/java/org/opensearch/script/GeneralScriptException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/script/IngestConditionalScript.java b/server/src/main/java/org/opensearch/script/IngestConditionalScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/IngestConditionalScript.java rename to server/src/main/java/org/opensearch/script/IngestConditionalScript.java index 1174b75fb50..fa190f2ae08 100644 --- a/server/src/main/java/org/elasticsearch/script/IngestConditionalScript.java +++ b/server/src/main/java/org/opensearch/script/IngestConditionalScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/elasticsearch/script/IngestScript.java b/server/src/main/java/org/opensearch/script/IngestScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/IngestScript.java rename to server/src/main/java/org/opensearch/script/IngestScript.java index 6af53e19614..b8658084519 100644 --- a/server/src/main/java/org/elasticsearch/script/IngestScript.java +++ b/server/src/main/java/org/opensearch/script/IngestScript.java @@ -18,7 +18,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/elasticsearch/script/JodaCompatibleZonedDateTime.java b/server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/JodaCompatibleZonedDateTime.java rename to server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java index ed5ab30a082..09c75afd47b 100644 --- a/server/src/main/java/org/elasticsearch/script/JodaCompatibleZonedDateTime.java +++ b/server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressLoggerChecks; diff --git a/server/src/main/java/org/elasticsearch/script/NumberSortScript.java b/server/src/main/java/org/opensearch/script/NumberSortScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/NumberSortScript.java rename to server/src/main/java/org/opensearch/script/NumberSortScript.java index f1eb118b8bd..0a5f96bc63b 100644 --- a/server/src/main/java/org/elasticsearch/script/NumberSortScript.java +++ b/server/src/main/java/org/opensearch/script/NumberSortScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/ScoreScript.java b/server/src/main/java/org/opensearch/script/ScoreScript.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScoreScript.java rename to server/src/main/java/org/opensearch/script/ScoreScript.java index d2c173baa6a..810d1538886 100644 --- a/server/src/main/java/org/elasticsearch/script/ScoreScript.java +++ b/server/src/main/java/org/opensearch/script/ScoreScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Explanation; diff --git a/server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java rename to server/src/main/java/org/opensearch/script/ScoreScriptUtils.java index c7d6e889397..4e4febe15c7 100644 --- a/server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java +++ b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.StringHelper; diff --git a/server/src/main/java/org/elasticsearch/script/Script.java b/server/src/main/java/org/opensearch/script/Script.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/Script.java rename to server/src/main/java/org/opensearch/script/Script.java index 4c9ceee07d7..c50db960807 100644 --- a/server/src/main/java/org/elasticsearch/script/Script.java +++ b/server/src/main/java/org/opensearch/script/Script.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.OpenSearchParseException; import org.elasticsearch.common.ParseField; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptCache.java b/server/src/main/java/org/opensearch/script/ScriptCache.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptCache.java rename to server/src/main/java/org/opensearch/script/ScriptCache.java index d3b3f11c518..e1c9a5ab242 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptCache.java +++ b/server/src/main/java/org/opensearch/script/ScriptCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptCacheStats.java b/server/src/main/java/org/opensearch/script/ScriptCacheStats.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptCacheStats.java rename to server/src/main/java/org/opensearch/script/ScriptCacheStats.java index b41420be895..565142c5f35 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptCacheStats.java +++ b/server/src/main/java/org/opensearch/script/ScriptCacheStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptContext.java b/server/src/main/java/org/opensearch/script/ScriptContext.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptContext.java rename to server/src/main/java/org/opensearch/script/ScriptContext.java index abdcc99a1a3..edc9df6374e 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptContext.java +++ b/server/src/main/java/org/opensearch/script/ScriptContext.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptContextInfo.java b/server/src/main/java/org/opensearch/script/ScriptContextInfo.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptContextInfo.java rename to server/src/main/java/org/opensearch/script/ScriptContextInfo.java index e0b858a7bcd..cce032dcc5a 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptContextInfo.java +++ b/server/src/main/java/org/opensearch/script/ScriptContextInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java b/server/src/main/java/org/opensearch/script/ScriptContextStats.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptContextStats.java rename to server/src/main/java/org/opensearch/script/ScriptContextStats.java index 7f376d9e33f..b82eb94afeb 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptContextStats.java +++ b/server/src/main/java/org/opensearch/script/ScriptContextStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptEngine.java b/server/src/main/java/org/opensearch/script/ScriptEngine.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/ScriptEngine.java rename to server/src/main/java/org/opensearch/script/ScriptEngine.java index 78a012700c2..65894cedba0 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptEngine.java +++ b/server/src/main/java/org/opensearch/script/ScriptEngine.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.io.Closeable; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptException.java b/server/src/main/java/org/opensearch/script/ScriptException.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/ScriptException.java rename to server/src/main/java/org/opensearch/script/ScriptException.java index b6839e0baba..cc7ef066b87 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptException.java +++ b/server/src/main/java/org/opensearch/script/ScriptException.java @@ -1,4 +1,23 @@ -package org.elasticsearch.script; +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.opensearch.script; import org.elasticsearch.OpenSearchException; import org.elasticsearch.Version; @@ -10,25 +29,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.rest.RestStatus; -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptFactory.java b/server/src/main/java/org/opensearch/script/ScriptFactory.java similarity index 96% rename from server/src/main/java/org/elasticsearch/script/ScriptFactory.java rename to server/src/main/java/org/opensearch/script/ScriptFactory.java index d05e4f77c64..0f5d34b713a 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptFactory.java +++ b/server/src/main/java/org/opensearch/script/ScriptFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; /** * Contains utility methods for compiled scripts without impacting concrete script signatures diff --git a/server/src/main/java/org/elasticsearch/script/ScriptLanguagesInfo.java b/server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptLanguagesInfo.java rename to server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java index 28b1c13e555..4cdad1cf2c0 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptLanguagesInfo.java +++ b/server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.collect.Tuple; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptMetadata.java b/server/src/main/java/org/opensearch/script/ScriptMetadata.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptMetadata.java rename to server/src/main/java/org/opensearch/script/ScriptMetadata.java index 4fbfe35afdf..20da0fdc760 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptMetadata.java +++ b/server/src/main/java/org/opensearch/script/ScriptMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.Version; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptMetrics.java b/server/src/main/java/org/opensearch/script/ScriptMetrics.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/ScriptMetrics.java rename to server/src/main/java/org/opensearch/script/ScriptMetrics.java index 3a91d18ec92..92edb288484 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptMetrics.java +++ b/server/src/main/java/org/opensearch/script/ScriptMetrics.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.metrics.CounterMetric; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptModule.java b/server/src/main/java/org/opensearch/script/ScriptModule.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptModule.java rename to server/src/main/java/org/opensearch/script/ScriptModule.java index 9ba340dc29f..acbeada29eb 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptModule.java +++ b/server/src/main/java/org/opensearch/script/ScriptModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptService.java b/server/src/main/java/org/opensearch/script/ScriptService.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptService.java rename to server/src/main/java/org/opensearch/script/ScriptService.java index cabdc9dc640..94aa77bedec 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptService.java +++ b/server/src/main/java/org/opensearch/script/ScriptService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -139,7 +139,7 @@ public class ScriptService implements Closeable, ClusterStateApplier { if (Strings.hasLength(settings.get(DISABLE_DYNAMIC_SCRIPTING_SETTING))) { throw new IllegalArgumentException(DISABLE_DYNAMIC_SCRIPTING_SETTING + " is not a supported setting, replace with " + "fine-grained script settings. \n Dynamic scripts can be enabled for all languages and all operations not " + - "using `script.disable_dynamic: false` in elasticsearch.yml"); + "using `script.disable_dynamic: false` in opensearch.yml"); } this.typesAllowed = TYPES_ALLOWED_SETTING.exists(settings) ? new HashSet<>() : null; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptStats.java b/server/src/main/java/org/opensearch/script/ScriptStats.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptStats.java rename to server/src/main/java/org/opensearch/script/ScriptStats.java index 155068c9343..da6cdeb7ca9 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptStats.java +++ b/server/src/main/java/org/opensearch/script/ScriptStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptType.java b/server/src/main/java/org/opensearch/script/ScriptType.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptType.java rename to server/src/main/java/org/opensearch/script/ScriptType.java index 5d356bbd7cb..4a12517065b 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptType.java +++ b/server/src/main/java/org/opensearch/script/ScriptType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/script/ScriptedMetricAggContexts.java b/server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/ScriptedMetricAggContexts.java rename to server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java index 1d25c4cf89f..cee74670e2f 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptedMetricAggContexts.java +++ b/server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; diff --git a/server/src/main/java/org/elasticsearch/script/SignificantTermsHeuristicScoreScript.java b/server/src/main/java/org/opensearch/script/SignificantTermsHeuristicScoreScript.java similarity index 97% rename from server/src/main/java/org/elasticsearch/script/SignificantTermsHeuristicScoreScript.java rename to server/src/main/java/org/opensearch/script/SignificantTermsHeuristicScoreScript.java index b1a280783a7..7bd3b11d557 100644 --- a/server/src/main/java/org/elasticsearch/script/SignificantTermsHeuristicScoreScript.java +++ b/server/src/main/java/org/opensearch/script/SignificantTermsHeuristicScoreScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/SimilarityScript.java b/server/src/main/java/org/opensearch/script/SimilarityScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/SimilarityScript.java rename to server/src/main/java/org/opensearch/script/SimilarityScript.java index c3efb55a603..4f284fe6c8f 100644 --- a/server/src/main/java/org/elasticsearch/script/SimilarityScript.java +++ b/server/src/main/java/org/opensearch/script/SimilarityScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.index.similarity.ScriptedSimilarity; diff --git a/server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java b/server/src/main/java/org/opensearch/script/SimilarityWeightScript.java similarity index 97% rename from server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java rename to server/src/main/java/org/opensearch/script/SimilarityWeightScript.java index 2797da64a0e..14e26f2d859 100644 --- a/server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java +++ b/server/src/main/java/org/opensearch/script/SimilarityWeightScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.index.similarity.ScriptedSimilarity; diff --git a/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java b/server/src/main/java/org/opensearch/script/StoredScriptSource.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/StoredScriptSource.java rename to server/src/main/java/org/opensearch/script/StoredScriptSource.java index a56221e2515..20cc3b1abcc 100644 --- a/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java +++ b/server/src/main/java/org/opensearch/script/StoredScriptSource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.cluster.AbstractDiffable; import org.elasticsearch.cluster.ClusterState; diff --git a/server/src/main/java/org/elasticsearch/script/StringSortScript.java b/server/src/main/java/org/opensearch/script/StringSortScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/StringSortScript.java rename to server/src/main/java/org/opensearch/script/StringSortScript.java index 8c459fceed6..3fa64feb66d 100644 --- a/server/src/main/java/org/elasticsearch/script/StringSortScript.java +++ b/server/src/main/java/org/opensearch/script/StringSortScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/TemplateScript.java b/server/src/main/java/org/opensearch/script/TemplateScript.java similarity index 97% rename from server/src/main/java/org/elasticsearch/script/TemplateScript.java rename to server/src/main/java/org/opensearch/script/TemplateScript.java index c053cf2b509..c900b2385e7 100644 --- a/server/src/main/java/org/elasticsearch/script/TemplateScript.java +++ b/server/src/main/java/org/opensearch/script/TemplateScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/script/TermsSetQueryScript.java b/server/src/main/java/org/opensearch/script/TermsSetQueryScript.java similarity index 99% rename from server/src/main/java/org/elasticsearch/script/TermsSetQueryScript.java rename to server/src/main/java/org/opensearch/script/TermsSetQueryScript.java index 440cb4c4b99..c5a8bfcd6f9 100644 --- a/server/src/main/java/org/elasticsearch/script/TermsSetQueryScript.java +++ b/server/src/main/java/org/opensearch/script/TermsSetQueryScript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.logging.DeprecationLogger; diff --git a/server/src/main/java/org/elasticsearch/script/UpdateScript.java b/server/src/main/java/org/opensearch/script/UpdateScript.java similarity index 98% rename from server/src/main/java/org/elasticsearch/script/UpdateScript.java rename to server/src/main/java/org/opensearch/script/UpdateScript.java index 656315d6bcb..4d897250b52 100644 --- a/server/src/main/java/org/elasticsearch/script/UpdateScript.java +++ b/server/src/main/java/org/opensearch/script/UpdateScript.java @@ -18,7 +18,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.logging.DeprecationLogger; diff --git a/server/src/main/java/org/elasticsearch/script/package-info.java b/server/src/main/java/org/opensearch/script/package-info.java similarity index 97% rename from server/src/main/java/org/elasticsearch/script/package-info.java rename to server/src/main/java/org/opensearch/script/package-info.java index 7ea85693cd3..7cafe483acd 100644 --- a/server/src/main/java/org/elasticsearch/script/package-info.java +++ b/server/src/main/java/org/opensearch/script/package-info.java @@ -22,4 +22,4 @@ * ({@link org.elasticsearch.common.lucene.search.function.FunctionScoreQuery}, {@link org.elasticsearch.search.aggregations.Aggregation}, * {@link org.elasticsearch.action.update.UpdateAction}, etc). Pluggable via implementing {@link org.elasticsearch.plugins.ScriptPlugin}. */ -package org.elasticsearch.script; +package org.opensearch.script; diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java index 2f0a6184976..3defd39e8af 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.lucene.BytesRefs; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.PageCacheRecycler; -import org.elasticsearch.script.JodaCompatibleZonedDateTime; +import org.opensearch.script.JodaCompatibleZonedDateTime; import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index d16dcc6e34d..6792fbd8e76 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -84,7 +84,7 @@ import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.indices.recovery.RecoveryState; import org.elasticsearch.plugins.IndexStorePlugin; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.internal.ReaderContext; import org.elasticsearch.test.ClusterServiceUtils; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java index 9e7c5e84a0c..971d81bfb6f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java @@ -22,8 +22,8 @@ package org.elasticsearch.index.query; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchModule; import org.elasticsearch.test.AbstractSerializingTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java index d3b5d5c8ecd..20a422274c5 100644 --- a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java @@ -28,8 +28,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java index d155b193f91..f5f529b1c94 100644 --- a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java @@ -36,10 +36,10 @@ import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java index d718291b9c8..98f8b6e5ea3 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java @@ -22,9 +22,9 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.Query; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.ParsingException; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java index 2ffdd229b58..788505b17ec 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java @@ -24,9 +24,9 @@ import org.apache.lucene.search.Query; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.lucene.search.function.ScriptScoreQuery; import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java index 05c5147c198..e7a56e2de42 100644 --- a/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java @@ -44,10 +44,10 @@ import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.MockScriptPlugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.MockScriptPlugin; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.rest.yaml.ObjectPath; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java index dd5a746b735..b5257b2fb23 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java @@ -50,9 +50,9 @@ import org.elasticsearch.index.query.WrapperQueryBuilder; import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java index c66cad93e4b..8b4180fb7b6 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.test.ESTestCase; import org.mockito.Mockito; diff --git a/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java index 755086539fe..6e7b047fd9d 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java @@ -41,8 +41,8 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; -import org.elasticsearch.script.SimilarityScript; -import org.elasticsearch.script.SimilarityWeightScript; +import org.opensearch.script.SimilarityScript; +import org.opensearch.script.SimilarityWeightScript; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index 2246640735e..c50ef6c096a 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -66,10 +66,10 @@ import org.elasticsearch.indices.settings.InternalOrPrivateSettingsPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.rest.RestStatus; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.MockScriptPlugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.MockScriptPlugin; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.MultiBucketConsumerService; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java index 873dd89bdcf..9882b648d63 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java @@ -20,9 +20,9 @@ package org.elasticsearch.search.aggregations; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.script.MockScriptPlugin; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptPlugin; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java index 5c8fc5e5c61..e6ae4668d55 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.TermsQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder; import org.elasticsearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java index 07f7adf5e84..167cbd033ca 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.bucket; -import org.elasticsearch.script.MockScriptPlugin; +import org.opensearch.script.MockScriptPlugin; import org.elasticsearch.search.lookup.LeafDocLookup; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java index c36ff50b7a3..e834f307511 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.aggregations.bucket.composite; import org.elasticsearch.common.geo.GeoBoundingBoxTests; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java index aab225ddf8e..6c435449db4 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.bucket.composite; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.sort.SortOrder; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java index 232dc24dd95..794c46da5da 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.MockBigArrays; import org.elasticsearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregations; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java index 49dd5354e32..84086c38a57 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java @@ -36,12 +36,12 @@ import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index d0a588fbe72..c83a938229e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java @@ -50,12 +50,12 @@ import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 5d2c1407133..2877f0bf57e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -62,12 +62,12 @@ import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java index 715e30f7b11..4e9608253de 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java @@ -37,12 +37,12 @@ import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java index f2d3e1a15b9..0aa7dcdaa27 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java @@ -22,12 +22,12 @@ package org.elasticsearch.search.aggregations.metrics; import org.elasticsearch.Version; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.Aggregation.CommonFields; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java index dce22574129..12b4cb7c409 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java @@ -50,12 +50,12 @@ import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.Aggregator; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java index 0a14ebfdd71..d8814815bbd 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java @@ -31,12 +31,12 @@ import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java index 6787386862f..8874e3454fd 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.function.BiFunction; import java.util.function.Function; -import org.elasticsearch.script.MockScriptPlugin; +import org.opensearch.script.MockScriptPlugin; import org.elasticsearch.search.lookup.LeafDocLookup; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java index ebf1f477dc1..e38918dff22 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java @@ -57,12 +57,12 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java index 8d8b3da1692..55281e3c294 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java @@ -41,12 +41,12 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java index a624eddea69..403e607d68a 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.search.aggregations.metrics; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java index f80f50b2da2..9790cede89d 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java @@ -34,12 +34,12 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java index dc90cea2261..36ffdc2233b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java @@ -43,12 +43,12 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregatorTests.java index 9fb4be83fb6..2b1bd2f4d17 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregatorTests.java @@ -45,12 +45,12 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java index e1a187b0e13..c4de944b868 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java @@ -36,12 +36,12 @@ import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilters; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilderTests.java index 2a2b7aeae55..803f97a17a8 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptPipelineAggregationBuilderTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.pipeline; -import org.elasticsearch.script.Script; +import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.BasePipelineAggregationTestCase; import java.util.HashMap; @@ -42,7 +42,7 @@ public class BucketScriptPipelineAggregationBuilderTests extends BasePipelineAgg } public void testNoParent() { - assertThat(validate(emptyList(), new BucketScriptPipelineAggregationBuilder("foo", emptyMap(), new Script("foo"))), + assertThat(validate(emptyList(), new BucketScriptPipelineAggregationBuilder("foo", emptyMap(), new Script("foo"))), equalTo("Validation Failed: 1: bucket_script aggregation [foo] must be declared inside of another aggregation;")); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java index fb2c65bc166..963cb3ddc95 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java @@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.pipeline; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.BasePipelineAggregationTestCase; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java index fba750e5f50..588d82b54cd 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.search.aggregations.pipeline; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.BasePipelineAggregationTestCase; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; @@ -61,7 +61,7 @@ public class BucketSelectorTests extends BasePipelineAggregationTestCase>").implies(new ClassPermission("java.lang.Math"))); assertFalse(new ClassPermission("<>").implies(new ClassPermission("pkg.MyClass"))); } - + public void testPermissionCollection() { ClassPermission math = new ClassPermission("java.lang.Math"); PermissionCollection collection = math.newPermissionCollection(); @@ -51,7 +51,7 @@ public class ClassPermissionTests extends ESTestCase { assertTrue(collection.implies(new ClassPermission("java.lang.Math"))); assertFalse(collection.implies(new ClassPermission("pkg.MyClass"))); } - + public void testPermissionCollectionStandard() { ClassPermission standard = new ClassPermission("<>"); PermissionCollection collection = standard.newPermissionCollection(); @@ -66,9 +66,9 @@ public class ClassPermissionTests extends ESTestCase { assertTrue(new ClassPermission("pkg.*").implies(new ClassPermission("pkg.MyClass"))); assertTrue(new ClassPermission("pkg.*").implies(new ClassPermission("pkg.sub.MyClass"))); assertFalse(new ClassPermission("pkg.My*").implies(new ClassPermission("pkg.MyClass"))); - assertFalse(new ClassPermission("pkg*").implies(new ClassPermission("pkg.MyClass"))); + assertFalse(new ClassPermission("pkg*").implies(new ClassPermission("pkg.MyClass"))); } - + public void testPermissionCollectionWildcards() { ClassPermission lang = new ClassPermission("java.lang.*"); PermissionCollection collection = lang.newPermissionCollection(); diff --git a/server/src/test/java/org/elasticsearch/script/JodaCompatibleZonedDateTimeTests.java b/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/JodaCompatibleZonedDateTimeTests.java rename to server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java index e6e951f5fcb..2b3fc55c869 100644 --- a/server/src/test/java/org/elasticsearch/script/JodaCompatibleZonedDateTimeTests.java +++ b/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptCacheTests.java b/server/src/test/java/org/opensearch/script/ScriptCacheTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/ScriptCacheTests.java rename to server/src/test/java/org/opensearch/script/ScriptCacheTests.java index 8d27ec2ff46..c4b5915b3dd 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptCacheTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptCacheTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.breaker.CircuitBreakingException; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptContextInfoTests.java b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/script/ScriptContextInfoTests.java rename to server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java index 444bc3e18db..243f82db602 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptContextInfoTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.collect.Tuple; @@ -27,8 +27,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.script.ScriptContextInfo.ScriptMethodInfo; -import org.elasticsearch.script.ScriptContextInfo.ScriptMethodInfo.ParameterInfo; +import org.opensearch.script.ScriptContextInfo.ScriptMethodInfo; +import org.opensearch.script.ScriptContextInfo.ScriptMethodInfo.ParameterInfo; import org.elasticsearch.test.ESTestCase; import java.io.IOException; @@ -105,7 +105,7 @@ public class ScriptContextInfoTests extends ESTestCase { } public void testCustomTypeContext() { - String ct = "org.elasticsearch.script.ScriptContextInfoTests$CustomType"; + String ct = "org.opensearch.script.ScriptContextInfoTests$CustomType"; String ct0 = ct + 0; String ct1 = ct + 1; String ct2 = ct + 2; @@ -316,10 +316,10 @@ public class ScriptContextInfoTests extends ESTestCase { "double", Collections.unmodifiableList(Arrays.asList( new ParameterInfo("double", "weight"), - new ParameterInfo("org.elasticsearch.index.similarity.ScriptedSimilarity$Query", "query"), - new ParameterInfo("org.elasticsearch.index.similarity.ScriptedSimilarity$Field", "field"), - new ParameterInfo("org.elasticsearch.index.similarity.ScriptedSimilarity$Term", "term"), - new ParameterInfo("org.elasticsearch.index.similarity.ScriptedSimilarity$Doc", "doc") + new ParameterInfo("org.opensearch.index.similarity.ScriptedSimilarity$Query", "query"), + new ParameterInfo("org.opensearch.index.similarity.ScriptedSimilarity$Field", "field"), + new ParameterInfo("org.opensearch.index.similarity.ScriptedSimilarity$Term", "term"), + new ParameterInfo("org.opensearch.index.similarity.ScriptedSimilarity$Doc", "doc") ) )), Collections.unmodifiableSet(new HashSet<>(Arrays.asList( diff --git a/server/src/test/java/org/elasticsearch/script/ScriptContextTests.java b/server/src/test/java/org/opensearch/script/ScriptContextTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/ScriptContextTests.java rename to server/src/test/java/org/opensearch/script/ScriptContextTests.java index 157b0969ae8..0cff9bcc980 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptContextTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptContextTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java b/server/src/test/java/org/opensearch/script/ScriptExceptionTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java rename to server/src/test/java/org/opensearch/script/ScriptExceptionTests.java index 6d5eac06f95..53722019eab 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptExceptionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.io.stream.DataOutputStreamOutput; import org.elasticsearch.common.io.stream.InputStreamStreamInput; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptLanguagesInfoTests.java b/server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/ScriptLanguagesInfoTests.java rename to server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java index 38139103ed2..3511d71563e 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptLanguagesInfoTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptMetadataTests.java b/server/src/test/java/org/opensearch/script/ScriptMetadataTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/ScriptMetadataTests.java rename to server/src/test/java/org/opensearch/script/ScriptMetadataTests.java index 736ee8c2811..7990fcd5e5c 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptMetadataTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptMetadataTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.cluster.DiffableUtils; import org.elasticsearch.common.bytes.BytesArray; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java rename to server/src/test/java/org/opensearch/script/ScriptServiceTests.java index 052f84dd2cb..09d3158f331 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.ResourceNotFoundException; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; @@ -44,12 +44,12 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; -import static org.elasticsearch.script.ScriptService.SCRIPT_CACHE_EXPIRE_SETTING; -import static org.elasticsearch.script.ScriptService.SCRIPT_CACHE_SIZE_SETTING; -import static org.elasticsearch.script.ScriptService.SCRIPT_GENERAL_CACHE_EXPIRE_SETTING; -import static org.elasticsearch.script.ScriptService.SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING; -import static org.elasticsearch.script.ScriptService.SCRIPT_GENERAL_CACHE_SIZE_SETTING; -import static org.elasticsearch.script.ScriptService.SCRIPT_MAX_COMPILATIONS_RATE_SETTING; +import static org.opensearch.script.ScriptService.SCRIPT_CACHE_EXPIRE_SETTING; +import static org.opensearch.script.ScriptService.SCRIPT_CACHE_SIZE_SETTING; +import static org.opensearch.script.ScriptService.SCRIPT_GENERAL_CACHE_EXPIRE_SETTING; +import static org.opensearch.script.ScriptService.SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING; +import static org.opensearch.script.ScriptService.SCRIPT_GENERAL_CACHE_SIZE_SETTING; +import static org.opensearch.script.ScriptService.SCRIPT_MAX_COMPILATIONS_RATE_SETTING; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/server/src/test/java/org/elasticsearch/script/ScriptTests.java b/server/src/test/java/org/opensearch/script/ScriptTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/ScriptTests.java rename to server/src/test/java/org/opensearch/script/ScriptTests.java index 0d60caa8b60..071969880f7 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.OpenSearchParseException; import org.elasticsearch.common.Strings; diff --git a/server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java b/server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java rename to server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java index d628561e2c6..01a2560a171 100644 --- a/server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java +++ b/server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/elasticsearch/script/StoredScriptTests.java b/server/src/test/java/org/opensearch/script/StoredScriptTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/script/StoredScriptTests.java rename to server/src/test/java/org/opensearch/script/StoredScriptTests.java index 3f8fcb829b0..0b9bbfa2afd 100644 --- a/server/src/test/java/org/elasticsearch/script/StoredScriptTests.java +++ b/server/src/test/java/org/opensearch/script/StoredScriptTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.common.ParsingException; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 4f95a38abfe..72d15d88f26 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -180,7 +180,7 @@ import org.elasticsearch.repositories.RepositoryData; import org.elasticsearch.repositories.blobstore.BlobStoreRepository; import org.elasticsearch.repositories.blobstore.BlobStoreTestUtil; import org.elasticsearch.repositories.fs.FsRepository; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.SearchService; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.FetchPhase; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index 702379720c4..94ba3838411 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -47,8 +47,8 @@ import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.ScriptPlugin; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java b/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java index 5bbf39d8fdc..8fab9452cf9 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java +++ b/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java @@ -20,16 +20,16 @@ package org.elasticsearch.ingest; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.TemplateScript; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptService; +import org.opensearch.script.TemplateScript; import java.util.Collections; import java.util.Map; -import static org.elasticsearch.script.Script.DEFAULT_TEMPLATE_LANG; +import static org.opensearch.script.Script.DEFAULT_TEMPLATE_LANG; public class TestTemplateService extends ScriptService { private boolean compilationException; diff --git a/test/framework/src/main/java/org/elasticsearch/node/MockNode.java b/test/framework/src/main/java/org/elasticsearch/node/MockNode.java index 42892c4afaa..60294b7a45b 100644 --- a/test/framework/src/main/java/org/elasticsearch/node/MockNode.java +++ b/test/framework/src/main/java/org/elasticsearch/node/MockNode.java @@ -38,10 +38,10 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptService; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.MockScriptService; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.MockSearchService; import org.elasticsearch.search.SearchService; import org.elasticsearch.search.fetch.FetchPhase; diff --git a/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java b/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java index fa9b40d0f45..4ff2641c64c 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java +++ b/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java @@ -25,7 +25,7 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.node.MockNode; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.internal.ReaderContext; import org.opensearch.threadpool.ThreadPool; diff --git a/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java b/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java index eab86315a08..11e0de0dcdf 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java @@ -32,8 +32,8 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.builder.PointInTimeBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index 5819c7c9389..690c42347ea 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -102,7 +102,7 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; import org.elasticsearch.search.aggregations.MultiBucketConsumerService.MultiBucketConsumer; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java index b0dd2009e8a..d10b1370865 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java @@ -69,12 +69,12 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.plugins.ScriptPlugin; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.MockScriptService; -import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.ScriptEngine; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.MockScriptService; +import org.opensearch.script.ScriptContext; +import org.opensearch.script.ScriptEngine; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.SearchModule; import org.junit.After; import org.junit.AfterClass; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 3513af5ff88..72870186dcf 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -136,8 +136,8 @@ import org.elasticsearch.plugins.NetworkPlugin; import org.elasticsearch.plugins.Plugin; import org.opensearch.rest.RestStatus; import org.opensearch.rest.action.RestCancellableNodeClient; -import org.elasticsearch.script.MockScriptService; -import org.elasticsearch.script.ScriptMetadata; +import org.opensearch.script.MockScriptService; +import org.opensearch.script.ScriptMetadata; import org.elasticsearch.search.MockSearchService; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchService; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index ee94e6c522c..c9f8baaf258 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -51,7 +51,7 @@ import org.elasticsearch.node.MockNode; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeValidationException; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptService; +import org.opensearch.script.MockScriptService; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.transport.TransportSettings; import org.junit.AfterClass; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index c05248fc17a..65efc9bb1a7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -106,9 +106,9 @@ import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.plugins.AnalysisPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.MockScriptEngine; -import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptType; +import org.opensearch.script.MockScriptEngine; +import org.opensearch.script.Script; +import org.opensearch.script.ScriptType; import org.elasticsearch.search.MockSearchService; import org.elasticsearch.test.junit.listeners.LoggingListener; import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java index a5d770f78b9..9abcdacb622 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java @@ -38,7 +38,7 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.aggregations.Aggregation; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index 46e8eff4751..b3d6f7efe2f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -109,8 +109,8 @@ import org.elasticsearch.node.NodeRoleSettings; import org.elasticsearch.node.NodeService; import org.elasticsearch.node.NodeValidationException; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.script.ScriptService; +import org.opensearch.script.ScriptModule; +import org.opensearch.script.ScriptService; import org.elasticsearch.search.SearchService; import org.opensearch.tasks.TaskManager; import org.elasticsearch.test.disruption.ServiceDisruptionScheme; diff --git a/test/framework/src/main/java/org/elasticsearch/script/MockDeterministicScript.java b/test/framework/src/main/java/org/opensearch/script/MockDeterministicScript.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/script/MockDeterministicScript.java rename to test/framework/src/main/java/org/opensearch/script/MockDeterministicScript.java index 8cafd512450..0c0caf5593b 100644 --- a/test/framework/src/main/java/org/elasticsearch/script/MockDeterministicScript.java +++ b/test/framework/src/main/java/org/opensearch/script/MockDeterministicScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import java.util.Map; import java.util.function.Function; diff --git a/test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java b/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java rename to test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java index 7ffe5f2fe5a..d2de13eaaa7 100644 --- a/test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; diff --git a/test/framework/src/main/java/org/elasticsearch/script/MockScriptPlugin.java b/test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/script/MockScriptPlugin.java rename to test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java index 972879a735a..7ffc30bdbf8 100644 --- a/test/framework/src/main/java/org/elasticsearch/script/MockScriptPlugin.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; diff --git a/test/framework/src/main/java/org/elasticsearch/script/MockScriptService.java b/test/framework/src/main/java/org/opensearch/script/MockScriptService.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/script/MockScriptService.java rename to test/framework/src/main/java/org/opensearch/script/MockScriptService.java index 70dfd05361d..58410db755f 100644 --- a/test/framework/src/main/java/org/elasticsearch/script/MockScriptService.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.MockNode; diff --git a/test/framework/src/main/java/org/elasticsearch/script/ScoreAccessor.java b/test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/script/ScoreAccessor.java rename to test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java index 721939cce97..23da28cbc4f 100644 --- a/test/framework/src/main/java/org/elasticsearch/script/ScoreAccessor.java +++ b/test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.script; +package org.opensearch.script; import org.apache.lucene.search.Scorable; import org.elasticsearch.search.lookup.DocLookup;