From a13b64d4f32a20d0e98d4173f2feb2fb71739814 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 10 Feb 2025 15:22:29 +0800 Subject: [PATCH] [ISSUE#13090] Compatible with v2 openapi to query configuration. (#13091) * Compatible with v2 openapi to query configuration. * Fix CI. --- .../query/DefaultChainRequestExtractor.java | 2 +- .../query/DefaultChainRequestExtractorTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java b/config/src/main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java index 4e3ca0c7ea4..eee3e662131 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java @@ -46,7 +46,7 @@ public String getName() { public ConfigQueryChainRequest extract(HttpServletRequest request) { final String dataId = request.getParameter("dataId"); final String group = request.getParameter("group"); - String tenant = request.getParameter("tenant"); + String tenant = request.getParameter("namespaceId") != null ? request.getParameter("namespaceId") : request.getParameter("tenant"); if (StringUtils.isBlank(tenant)) { tenant = StringUtils.EMPTY; } diff --git a/config/src/test/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractorTest.java b/config/src/test/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractorTest.java index 765c9a8183d..98e45a0d8db 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractorTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractorTest.java @@ -65,7 +65,7 @@ public void tearDown() { public void extractWithAllParametersShouldReturnCorrectConfigQueryChainRequest() { when(request.getParameter("dataId")).thenReturn("dataId"); when(request.getParameter("group")).thenReturn("group"); - when(request.getParameter("tenant")).thenReturn("tenant"); + when(request.getParameter("namespaceId")).thenReturn("testNamespaceId"); when(request.getParameter("tag")).thenReturn("tag"); when(request.getHeader(VIPSERVER_TAG)).thenReturn("autoTag"); requestUtilMockedStatic.when(() -> RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1"); @@ -74,7 +74,7 @@ public void extractWithAllParametersShouldReturnCorrectConfigQueryChainRequest() assertEquals("dataId", result.getDataId()); assertEquals("group", result.getGroup()); - assertEquals("tenant", result.getTenant()); + assertEquals("testNamespaceId", result.getTenant()); assertEquals("tag", result.getTag()); assertEquals("127.0.0.1", result.getAppLabels().get(BetaGrayRule.CLIENT_IP_LABEL)); assertEquals("tag", result.getAppLabels().get(TagGrayRule.VIP_SERVER_TAG_LABEL)); @@ -84,7 +84,7 @@ public void extractWithAllParametersShouldReturnCorrectConfigQueryChainRequest() public void extractWithEmptyTenantShouldReturnCorrectConfigQueryChainRequest() { when(request.getParameter("dataId")).thenReturn("dataId"); when(request.getParameter("group")).thenReturn("group"); - when(request.getParameter("tenant")).thenReturn(""); + when(request.getParameter("namespaceId")).thenReturn(""); when(request.getParameter("tag")).thenReturn("tag"); when(request.getHeader(VIPSERVER_TAG)).thenReturn("autoTag"); requestUtilMockedStatic.when(() -> RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1"); @@ -103,7 +103,7 @@ public void extractWithEmptyTenantShouldReturnCorrectConfigQueryChainRequest() { public void extractWithEmptyTagAndAutoTagShouldReturnCorrectConfigQueryChainRequest() { when(request.getParameter("dataId")).thenReturn("dataId"); when(request.getParameter("group")).thenReturn("group"); - when(request.getParameter("tenant")).thenReturn("tenant"); + when(request.getParameter("namespaceId")).thenReturn("testNamespaceId"); when(request.getParameter("tag")).thenReturn(""); when(request.getHeader(VIPSERVER_TAG)).thenReturn(""); requestUtilMockedStatic.when(() -> RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1"); @@ -112,7 +112,7 @@ public void extractWithEmptyTagAndAutoTagShouldReturnCorrectConfigQueryChainRequ assertEquals("dataId", result.getDataId()); assertEquals("group", result.getGroup()); - assertEquals("tenant", result.getTenant()); + assertEquals("testNamespaceId", result.getTenant()); assertEquals("", result.getTag()); assertEquals("127.0.0.1", result.getAppLabels().get(BetaGrayRule.CLIENT_IP_LABEL)); assertNull(result.getAppLabels().get(TagGrayRule.VIP_SERVER_TAG_LABEL)); @@ -122,7 +122,7 @@ public void extractWithEmptyTagAndAutoTagShouldReturnCorrectConfigQueryChainRequ public void extractWithAutoTagShouldReturnCorrectConfigQueryChainRequest() { when(request.getParameter("dataId")).thenReturn("dataId"); when(request.getParameter("group")).thenReturn("group"); - when(request.getParameter("tenant")).thenReturn("tenant"); + when(request.getParameter("namespaceId")).thenReturn("testNamespaceId"); when(request.getParameter("tag")).thenReturn(""); when(request.getHeader(VIPSERVER_TAG)).thenReturn("autoTag"); when(RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1"); @@ -131,7 +131,7 @@ public void extractWithAutoTagShouldReturnCorrectConfigQueryChainRequest() { assertEquals("dataId", result.getDataId()); assertEquals("group", result.getGroup()); - assertEquals("tenant", result.getTenant()); + assertEquals("testNamespaceId", result.getTenant()); assertEquals("", result.getTag()); assertEquals("127.0.0.1", result.getAppLabels().get(BetaGrayRule.CLIENT_IP_LABEL)); assertEquals("autoTag", result.getAppLabels().get(TagGrayRule.VIP_SERVER_TAG_LABEL));