From 574221004ed124f3d6a38b1198a76e37bcf89101 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 18 Jan 2024 16:24:23 -0800 Subject: [PATCH 1/4] Deprecate client.type client.type existed from the days of the node client existing alongside the java client. Since the node client no longer exists, it no longer serves a purpose, and is already ignored. Yet the setting still exists. This commit deprecates the client.type node setting. --- .../src/main/java/org/elasticsearch/client/internal/Client.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/client/internal/Client.java b/server/src/main/java/org/elasticsearch/client/internal/Client.java index 5ae3870338c35..617ed542ce75d 100644 --- a/server/src/main/java/org/elasticsearch/client/internal/Client.java +++ b/server/src/main/java/org/elasticsearch/client/internal/Client.java @@ -78,7 +78,7 @@ public interface Client extends ElasticsearchClient { case "node", "transport" -> s; default -> throw new IllegalArgumentException("Can't parse [client.type] must be one of [node, transport]"); }; - }, Property.NodeScope); + }, Property.NodeScope, Property.Deprecated); /** * The admin client that can be used to perform administrative operations. From 49b12559d46374e4347a8966ee590502eb324d57 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 18 Jan 2024 16:28:36 -0800 Subject: [PATCH 2/4] Update docs/changelog/104574.yaml --- docs/changelog/104574.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docs/changelog/104574.yaml diff --git a/docs/changelog/104574.yaml b/docs/changelog/104574.yaml new file mode 100644 index 0000000000000..b65cd76613c42 --- /dev/null +++ b/docs/changelog/104574.yaml @@ -0,0 +1,11 @@ +pr: 104574 +summary: Deprecate `client.type` +area: Infra/Core +type: deprecation +issues: [] +deprecation: + title: Deprecate `client.type` + area: Infra/Core + details: Please describe the details of this change for the release notes. You can + use asciidoc. + impact: Please describe the impact of this change to users From 3254803dbd8bd9692935ae490c1de31d6cdf47fc Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 18 Jan 2024 16:43:45 -0800 Subject: [PATCH 3/4] update changelog --- docs/changelog/104574.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/changelog/104574.yaml b/docs/changelog/104574.yaml index b65cd76613c42..70f0307806fb5 100644 --- a/docs/changelog/104574.yaml +++ b/docs/changelog/104574.yaml @@ -6,6 +6,5 @@ issues: [] deprecation: title: Deprecate `client.type` area: Infra/Core - details: Please describe the details of this change for the release notes. You can - use asciidoc. - impact: Please describe the impact of this change to users + details: The node setting `client.type` has been ignored since the node client was removed in 8.0. The setting is now deprecated and will be removed in a future release. + impact: Remove the `client.type` setting from `elasticsearch.yml` From 47c77657b47c6689a6bfd86f5a8fd3b580c4b665 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 18 Jan 2024 16:51:40 -0800 Subject: [PATCH 4/4] set deprecation area --- docs/changelog/104574.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog/104574.yaml b/docs/changelog/104574.yaml index 70f0307806fb5..68be002142fd9 100644 --- a/docs/changelog/104574.yaml +++ b/docs/changelog/104574.yaml @@ -5,6 +5,6 @@ type: deprecation issues: [] deprecation: title: Deprecate `client.type` - area: Infra/Core + area: Cluster and node setting details: The node setting `client.type` has been ignored since the node client was removed in 8.0. The setting is now deprecated and will be removed in a future release. impact: Remove the `client.type` setting from `elasticsearch.yml`