From 16797d658125a8c28ddf49413222f30675352dd6 Mon Sep 17 00:00:00 2001 From: Amit Chakraborti <62286727+amitchakraborti9@users.noreply.github.com> Date: Tue, 28 Mar 2023 04:05:07 +0530 Subject: [PATCH] fix for updating version numbers for deprecation messages (#4719) Signed-off-by: Amit Chakraborti --- .../org/opensearch/ingest/useragent/UserAgentProcessor.java | 2 +- .../test/ingest-useragent/20_useragent_processor.yml | 2 +- .../mapper/annotatedtext/AnnotatedTextFieldMapperTests.java | 2 +- .../src/test/java/org/opensearch/backwards/IndexingIT.java | 2 +- .../rest-api-spec/test/indices.shrink/30_copy_settings.yml | 2 +- .../rest-api-spec/test/indices.split/30_copy_settings.yml | 2 +- .../org/opensearch/index/mapper/ParametrizedFieldMapper.java | 2 +- .../main/java/org/opensearch/index/mapper/TypeParsers.java | 2 +- .../rest/action/admin/indices/RestResizeHandler.java | 2 +- .../org/opensearch/index/mapper/BooleanFieldMapperTests.java | 2 +- .../org/opensearch/index/mapper/DateFieldMapperTests.java | 2 +- .../org/opensearch/index/mapper/KeywordFieldMapperTests.java | 4 ++-- .../org/opensearch/index/mapper/RangeFieldMapperTests.java | 2 +- .../org/opensearch/index/mapper/TextFieldMapperTests.java | 2 +- .../main/java/org/opensearch/index/mapper/MapperTestCase.java | 2 +- .../java/org/opensearch/test/rest/OpenSearchRestTestCase.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java index df88e98e7fc4f..45d8ee60ae95c 100644 --- a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java +++ b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java @@ -352,7 +352,7 @@ public UserAgentProcessor create( deprecationLogger.deprecate( "ecs_false_non_common_schema", "setting [ecs] to false for non-common schema " - + "format is deprecated and will be removed in 8.0, set to true or remove to use the non-deprecated format" + + "format is deprecated and will be removed in 3.0, set to true or remove to use the non-deprecated format" ); } diff --git a/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml index c7ab1751d1b0d..a3c9afc02dac4 100644 --- a/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml +++ b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml @@ -87,7 +87,7 @@ - do: allowed_warnings: - - "setting [ecs] to false for non-common schema format is deprecated and will be removed in 8.0, set to true or remove to use the non-deprecated format" + - "setting [ecs] to false for non-common schema format is deprecated and will be removed in 3.0, set to true or remove to use the non-deprecated format" - "the [os_major] property is deprecated for the user-agent processor" ingest.put_pipeline: id: "my_pipeline" diff --git a/plugins/mapper-annotated-text/src/internalClusterTest/java/org/opensearch/index/mapper/annotatedtext/AnnotatedTextFieldMapperTests.java b/plugins/mapper-annotated-text/src/internalClusterTest/java/org/opensearch/index/mapper/annotatedtext/AnnotatedTextFieldMapperTests.java index ab959d0e7a78d..d03fcd47fe991 100644 --- a/plugins/mapper-annotated-text/src/internalClusterTest/java/org/opensearch/index/mapper/annotatedtext/AnnotatedTextFieldMapperTests.java +++ b/plugins/mapper-annotated-text/src/internalClusterTest/java/org/opensearch/index/mapper/annotatedtext/AnnotatedTextFieldMapperTests.java @@ -99,7 +99,7 @@ protected void writeFieldValue(XContentBuilder builder) throws IOException { @Override protected void assertParseMaximalWarnings() { - assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 8.0"); + assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 3.0"); } @Override diff --git a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/IndexingIT.java b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/IndexingIT.java index 4746ad35a9406..2e36a352c75dd 100644 --- a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/IndexingIT.java +++ b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/IndexingIT.java @@ -323,7 +323,7 @@ public void testSyncedFlushTransition() throws Exception { ResponseException responseException = expectThrows(ResponseException.class, () -> oldNodeClient.performRequest(request)); assertThat(responseException.getResponse().getStatusLine().getStatusCode(), equalTo(RestStatus.CONFLICT.getStatus())); assertThat(responseException.getResponse().getWarnings(), - contains("Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead.")); + contains("Synced flush is deprecated and will be removed in 3.0. Use flush at _/flush or /{index}/_flush instead.")); Map result = ObjectPath.createFromResponse(responseException.getResponse()).evaluate("_shards"); assertThat(result.get("total"), equalTo(totalShards)); assertThat(result.get("successful"), equalTo(0)); diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml index 33bcb18f8afb6..07d5076550889 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml @@ -46,7 +46,7 @@ index.number_of_replicas: 0 index.merge.scheduler.max_thread_count: 2 allowed_warnings: - - "parameter [copy_settings] is deprecated and will be removed in 8.0.0" + - "parameter [copy_settings] is deprecated and will be removed in 3.0.0" - "Parameter [master_timeout] is deprecated and will be removed in 3.0. To support inclusive language, please use [cluster_manager_timeout] instead." - do: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml index 5b7f8f9960774..b8e6b54a393b9 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml @@ -48,7 +48,7 @@ index.number_of_shards: 2 index.merge.scheduler.max_thread_count: 2 allowed_warnings: - - "parameter [copy_settings] is deprecated and will be removed in 8.0.0" + - "parameter [copy_settings] is deprecated and will be removed in 3.0.0" - "Parameter [master_timeout] is deprecated and will be removed in 3.0. To support inclusive language, please use [cluster_manager_timeout] instead." - do: diff --git a/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java index a06c3ef88d001..b4fa781090615 100644 --- a/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java @@ -705,7 +705,7 @@ public final void parse(String name, ParserContext parserContext, Map b.field("type", "keyword").field("boost", 2f))); assertThat(mapperService.fieldType("field").boost(), equalTo(2f)); - assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 8.0"); + assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 3.0"); } public void testEnableNorms() throws IOException { diff --git a/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java index 4c1dc44f801ea..448bb272872ee 100644 --- a/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java +++ b/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java @@ -97,7 +97,7 @@ public void testExistsQueryDocValuesDisabled() throws IOException { @Override protected void assertParseMaximalWarnings() { - assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 8.0"); + assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 3.0"); } protected void registerParameters(ParameterChecker checker) throws IOException { diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java index 776f2f42780a5..be4379205e960 100644 --- a/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java +++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java @@ -103,7 +103,7 @@ protected void writeFieldValue(XContentBuilder builder) throws IOException { @Override protected void assertParseMaximalWarnings() { - assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 8.0"); + assertWarnings("Parameter [boost] on field [field] is deprecated and will be removed in 3.0"); } public final void testExistsQueryIndexDisabled() throws IOException { diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java index 5634482ab7c6b..420cb5f86e95f 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java @@ -274,7 +274,7 @@ public void testDeprecatedBoost() throws IOException { })); String type = typeName(); String[] warnings = new String[] { - "Parameter [boost] on field [field] is deprecated and will be removed in 8.0", + "Parameter [boost] on field [field] is deprecated and will be removed in 3.0", "Parameter [boost] has no effect on type [" + type + "] and will be removed in future" }; allowedWarnings(warnings); } diff --git a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java index 9b8a84a5ed842..70dfba204ff9e 100644 --- a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java @@ -1244,7 +1244,7 @@ protected void syncedFlush(String indexName, boolean retryOnConflict) throws Exc final Builder options = RequestOptions.DEFAULT.toBuilder(); // 8.0 kept in warning message for legacy purposes TODO: changge to 3.0 final List warningMessage = Arrays.asList( - "Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead." + "Synced flush is deprecated and will be removed in 3.0. Use flush at _/flush or /{index}/_flush instead." ); final List expectedWarnings = Arrays.asList( "Synced flush was removed and a normal flush was performed instead. This transition will be removed in a future version."