From a78fffaa8d64689ebb8dcb4bd8ef6e8e1158a085 Mon Sep 17 00:00:00 2001 From: Shenali Date: Wed, 9 Oct 2024 16:19:15 +0530 Subject: [PATCH 1/5] Refactor action request data model --- .../action/execution/model/Header.java | 45 +++++++++++++++++++ .../action/execution/model/Param.java | 45 +++++++++++++++++++ .../action/execution/model/Request.java | 20 ++++----- .../action/execution/util/RequestFilter.java | 26 ++++++----- 4 files changed, 114 insertions(+), 22 deletions(-) create mode 100644 components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java create mode 100644 components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Param.java diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java new file mode 100644 index 000000000000..ce0f394ce987 --- /dev/null +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. 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.wso2.carbon.identity.action.execution.model; + +/** + * This class models the Header. + * Header is the entity that represents additional headers sent in the action request. + */ +public class Header { + + private final String name; + private final String[] value; + + public Header(String name, String[] value) { + + this.name = name; + this.value = value; + } + + public String getName() { + + return name; + } + + public String[] getValue() { + + return value; + } +} diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Param.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Param.java new file mode 100644 index 000000000000..ffd6a21a2d81 --- /dev/null +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Param.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. 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.wso2.carbon.identity.action.execution.model; + +/** + * This class models the Param. + * Param is the entity that represents additional params sent in the action request. + */ +public class Param { + + private final String name; + private final String[] value; + + public Param(String name, String[] value) { + + this.name = name; + this.value = value; + } + + public String getName() { + + return name; + } + + public String[] getValue() { + + return value; + } +} diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Request.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Request.java index 96640a7da390..8a793101fc5b 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Request.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Request.java @@ -18,9 +18,9 @@ package org.wso2.carbon.identity.action.execution.model; +import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import java.util.List; /** * This class models the Request. @@ -30,25 +30,25 @@ */ public abstract class Request { - protected Map additionalHeaders = new HashMap<>(); - protected Map additionalParams = new HashMap<>(); + protected List
additionalHeaders = new ArrayList<>(); + protected List additionalParams = new ArrayList<>(); - public Map getAdditionalHeaders() { + public List
getAdditionalHeaders() { - return additionalHeaders != null ? Collections.unmodifiableMap(additionalHeaders) : Collections.emptyMap(); + return additionalHeaders != null ? Collections.unmodifiableList(additionalHeaders) : Collections.emptyList(); } - public void setAdditionalHeaders(Map additionalHeaders) { + public void setAdditionalHeaders(List
additionalHeaders) { this.additionalHeaders = additionalHeaders; } - public Map getAdditionalParams() { + public List getAdditionalParams() { - return additionalParams != null ? Collections.unmodifiableMap(additionalParams) : Collections.emptyMap(); + return additionalParams != null ? Collections.unmodifiableList(additionalParams) : Collections.emptyList(); } - public void setAdditionalParams(Map additionalParams) { + public void setAdditionalParams(List additionalParams) { this.additionalParams = additionalParams; } diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java index 59e6a4da7701..4931025da782 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java @@ -19,10 +19,12 @@ package org.wso2.carbon.identity.action.execution.util; import org.wso2.carbon.identity.action.execution.model.ActionType; +import org.wso2.carbon.identity.action.execution.model.Header; +import org.wso2.carbon.identity.action.execution.model.Param; -import java.util.HashMap; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Set; /** @@ -32,31 +34,31 @@ */ public class RequestFilter { - public static Map getFilteredHeaders(Map headers, ActionType actionType) { + public static List
getFilteredHeaders(List
headers, ActionType actionType) { - Map filteredHeaders = new HashMap<>(); + List
filteredHeaders = new ArrayList<>(); Set excludedHeaders = ActionExecutorConfig.getInstance() .getExcludedHeadersInActionRequestForActionType(actionType); - headers.forEach((key, value) -> { + headers.forEach(header -> { // Headers are case-insensitive. Therefore, convert the key to lowercase before comparing. - if (!excludedHeaders.contains(key.toLowerCase(Locale.ROOT))) { - filteredHeaders.put(key, value); + if (!excludedHeaders.contains(header.getName().toLowerCase(Locale.ROOT))) { + filteredHeaders.add(header); } }); return filteredHeaders; } - public static Map getFilteredParams(Map params, ActionType actionType) { + public static List getFilteredParams(List params, ActionType actionType) { - Map filteredParams = new HashMap<>(); + List filteredParams = new ArrayList<>(); Set excludedParams = ActionExecutorConfig.getInstance() .getExcludedParamsInActionRequestForActionType(actionType); - params.forEach((key, value) -> { - if (!excludedParams.contains(key)) { - filteredParams.put(key, value); + params.forEach(param -> { + if (!excludedParams.contains(param.getName())) { + filteredParams.add(param); } }); From 311b71367e43d41972298acf743b6eb05824ff58 Mon Sep 17 00:00:00 2001 From: Shenali Date: Wed, 9 Oct 2024 19:49:21 +0530 Subject: [PATCH 2/5] Update unit tests --- .../action/execution/model/Header.java | 5 ++- .../action/execution/util/RequestFilter.java | 4 +- .../ActionExecutorServiceImplTest.java | 24 +++++----- .../execution/util/RequestFilterTest.java | 44 ++++++++++++------- 4 files changed, 46 insertions(+), 31 deletions(-) diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java index ce0f394ce987..98ca57f0f3b4 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java @@ -18,6 +18,8 @@ package org.wso2.carbon.identity.action.execution.model; +import java.util.Locale; + /** * This class models the Header. * Header is the entity that represents additional headers sent in the action request. @@ -29,7 +31,8 @@ public class Header { public Header(String name, String[] value) { - this.name = name; + // Headers are case-insensitive. Therefore, convert the key to lowercase before initiating. + this.name = name.toLowerCase(Locale.ROOT); this.value = value; } diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java index 4931025da782..76e607b4826e 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Locale; import java.util.Set; /** @@ -41,8 +40,7 @@ public static List
getFilteredHeaders(List
headers, ActionType a .getExcludedHeadersInActionRequestForActionType(actionType); headers.forEach(header -> { - // Headers are case-insensitive. Therefore, convert the key to lowercase before comparing. - if (!excludedHeaders.contains(header.getName().toLowerCase(Locale.ROOT))) { + if (!excludedHeaders.contains(header.getName())) { filteredHeaders.add(header); } }); diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java index dea9ea13b394..263a9cc733ec 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java @@ -41,8 +41,10 @@ import org.wso2.carbon.identity.action.execution.model.AllowedOperation; import org.wso2.carbon.identity.action.execution.model.Application; import org.wso2.carbon.identity.action.execution.model.Event; +import org.wso2.carbon.identity.action.execution.model.Header; import org.wso2.carbon.identity.action.execution.model.Operation; import org.wso2.carbon.identity.action.execution.model.Organization; +import org.wso2.carbon.identity.action.execution.model.Param; import org.wso2.carbon.identity.action.execution.model.Request; import org.wso2.carbon.identity.action.execution.model.Tenant; import org.wso2.carbon.identity.action.execution.model.User; @@ -265,8 +267,8 @@ public void testBuildActionExecutionRequestWithExcludedHeaders() throws Exceptio .thenReturn(actionExecutionResponseProcessor); // Mock RequestFilter used in Request class - requestFilter.when(() -> RequestFilter.getFilteredHeaders(any(), any())).thenReturn(new HashMap<>()); - requestFilter.when(() -> RequestFilter.getFilteredParams(any(), any())).thenReturn(new HashMap<>()); + requestFilter.when(() -> RequestFilter.getFilteredHeaders(any(), any())).thenReturn(new ArrayList
()); + requestFilter.when(() -> RequestFilter.getFilteredParams(any(), any())).thenReturn(new ArrayList()); ActionExecutionRequest actionExecutionRequest = createActionExecutionRequest(actionType); @@ -520,16 +522,16 @@ private ActionInvocationResponse createErrorActionInvocationResponse() { private ActionExecutionRequest createActionExecutionRequest(ActionType actionType) throws Exception { - Map headers = new HashMap<>(); - headers.put("Content-Type", new String[]{"application/json"}); - headers.put("X-Header-1", new String[]{"X-header-1-value"}); - headers.put("X-Header-2", new String[]{"X-header-2-value"}); - headers.put("X-Header-3", new String[]{"X-header-3-value"}); + List
headers = new ArrayList<>(); + headers.add(new Header("Content-Type", new String[]{"application/json"})); + headers.add(new Header("X-Header-1", new String[]{"X-header-1-value"})); + headers.add(new Header("X-Header-2", new String[]{"X-header-2-value"})); + headers.add(new Header("X-Header-3", new String[]{"X-header-3-value"})); - Map params = new HashMap<>(); - params.put("x-param-1", new String[]{"X-param-1-value"}); - params.put("x-param-2", new String[]{"X-param-2-value"}); - params.put("x-param-3", new String[]{"X-param-3-value"}); + List params = new ArrayList<>(); + params.add(new Param("x-param-1", new String[]{"X-param-1-value"})); + params.add(new Param("x-param-2", new String[]{"X-param-2-value"})); + params.add(new Param("x-param-3", new String[]{"X-param-3-value"})); Request request = spy(mock(ConcreteRequest.class)); setField(request, "additionalHeaders", headers); diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java index f2761f829409..74e7c61ef555 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java @@ -24,10 +24,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.wso2.carbon.identity.action.execution.model.ActionType; +import org.wso2.carbon.identity.action.execution.model.Header; +import org.wso2.carbon.identity.action.execution.model.Param; -import java.util.HashMap; +import java.util.ArrayList; import java.util.HashSet; -import java.util.Map; +import java.util.List; import java.util.Set; import static org.mockito.Mockito.mockStatic; @@ -62,16 +64,21 @@ public void testGetFilteredHeaders() { Mockito.when(config.getExcludedHeadersInActionRequestForActionType(ActionType.PRE_ISSUE_ACCESS_TOKEN)) .thenReturn(excludedHeaders); - Map headers = new HashMap<>(); - headers.put("Content-Type", new String[]{"application/json"}); - headers.put("X-Header-1", new String[]{"X-header-1-value"}); - headers.put("X-Header-3", new String[]{"X-header-3-value"}); + List
headers = new ArrayList<>(); + headers.add(new Header("Content-Type", new String[]{"application/json"})); + headers.add(new Header("X-Header-1", new String[]{"X-header-1-value"})); + headers.add(new Header("X-Header-3", new String[]{"X-header-3-value"})); - Map filteredHeaders = + List
filteredHeaders = RequestFilter.getFilteredHeaders(headers, ActionType.PRE_ISSUE_ACCESS_TOKEN); assertEquals(filteredHeaders.size(), 2); - assertEquals(filteredHeaders.get("Content-Type"), new String[]{"application/json"}); - assertEquals(filteredHeaders.get("X-Header-3"), new String[]{"X-header-3-value"}); + filteredHeaders.forEach(filteredHeader -> { + if (filteredHeader.getName().equalsIgnoreCase("Content-Type")) { + assertEquals(filteredHeader.getValue(), new String[]{"application/json"}); + } else if (filteredHeader.getName().equalsIgnoreCase("X-Header-3")) { + assertEquals(filteredHeader.getValue(), new String[]{"X-header-3-value"}); + } + }); } @Test @@ -85,15 +92,20 @@ public void testGetFilteredParams() { Mockito.when(config.getExcludedParamsInActionRequestForActionType(ActionType.PRE_ISSUE_ACCESS_TOKEN)) .thenReturn(excludedParams); - Map params = new HashMap<>(); - params.put("x-param-1", new String[]{"X-param-1-value"}); - params.put("X-Param-2", new String[]{"X-Param-2-Value"}); - params.put("x-param-3", new String[]{"X-param-3-value"}); + List params = new ArrayList<>(); + params.add(new Param("x-param-1", new String[]{"X-param-1-value"})); + params.add(new Param("X-Param-2", new String[]{"X-Param-2-Value"})); + params.add(new Param("x-param-3", new String[]{"X-param-3-value"})); - Map filteredParams = + List filteredParams = RequestFilter.getFilteredParams(params, ActionType.PRE_ISSUE_ACCESS_TOKEN); assertEquals(filteredParams.size(), 2); - assertEquals(filteredParams.get("x-param-3"), new String[]{"X-param-3-value"}); - assertEquals(filteredParams.get("X-Param-2"), new String[]{"X-Param-2-Value"}); + filteredParams.forEach(filteredParam -> { + if (filteredParam.getName().equalsIgnoreCase("x-param-3")) { + assertEquals(filteredParam.getValue(), new String[]{"X-param-3-value"}); + } else if (filteredParam.getName().equalsIgnoreCase("X-Param-2")) { + assertEquals(filteredParam.getValue(), new String[]{"X-Param-2-Value"}); + } + }); } } From b1aae9dc06fbd0613e3c1b079177f23ce977be61 Mon Sep 17 00:00:00 2001 From: Shenali Date: Thu, 10 Oct 2024 14:17:42 +0530 Subject: [PATCH 3/5] Refactor pre issue access token action request object --- .../wso2/carbon/identity/action/execution/model/Header.java | 4 +--- .../carbon/identity/action/execution/util/RequestFilter.java | 3 ++- .../identity/action/execution/util/RequestFilterTest.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java index 98ca57f0f3b4..506530c9bc76 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java @@ -18,8 +18,6 @@ package org.wso2.carbon.identity.action.execution.model; -import java.util.Locale; - /** * This class models the Header. * Header is the entity that represents additional headers sent in the action request. @@ -32,7 +30,7 @@ public class Header { public Header(String name, String[] value) { // Headers are case-insensitive. Therefore, convert the key to lowercase before initiating. - this.name = name.toLowerCase(Locale.ROOT); + this.name = name; this.value = value; } diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java index 76e607b4826e..2442649ad502 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/RequestFilter.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Set; /** @@ -40,7 +41,7 @@ public static List
getFilteredHeaders(List
headers, ActionType a .getExcludedHeadersInActionRequestForActionType(actionType); headers.forEach(header -> { - if (!excludedHeaders.contains(header.getName())) { + if (!excludedHeaders.contains(header.getName().toLowerCase(Locale.ROOT))) { filteredHeaders.add(header); } }); diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java index 74e7c61ef555..e592f6cadc98 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java @@ -101,9 +101,9 @@ public void testGetFilteredParams() { RequestFilter.getFilteredParams(params, ActionType.PRE_ISSUE_ACCESS_TOKEN); assertEquals(filteredParams.size(), 2); filteredParams.forEach(filteredParam -> { - if (filteredParam.getName().equalsIgnoreCase("x-param-3")) { + if (filteredParam.getName().equals("x-param-3")) { assertEquals(filteredParam.getValue(), new String[]{"X-param-3-value"}); - } else if (filteredParam.getName().equalsIgnoreCase("X-Param-2")) { + } else if (filteredParam.getName().equals("X-Param-2")) { assertEquals(filteredParam.getValue(), new String[]{"X-Param-2-Value"}); } }); From 0adf1aab11bcc272ee45c5ff13361cd624036501 Mon Sep 17 00:00:00 2001 From: Malithi Madara Edirisinghe Date: Thu, 10 Oct 2024 14:48:28 +0530 Subject: [PATCH 4/5] Remove redundant comment --- .../wso2/carbon/identity/action/execution/model/Header.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java index 506530c9bc76..6fc4e1402ce9 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Header.java @@ -28,8 +28,7 @@ public class Header { private final String[] value; public Header(String name, String[] value) { - - // Headers are case-insensitive. Therefore, convert the key to lowercase before initiating. + this.name = name; this.value = value; } From acf6da74ef085c10b515a85a1254c949b2ea4c79 Mon Sep 17 00:00:00 2001 From: Malithi Madara Edirisinghe Date: Thu, 10 Oct 2024 14:54:10 +0530 Subject: [PATCH 5/5] Remove redundant case insensitivity check. --- .../identity/action/execution/util/RequestFilterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java index e592f6cadc98..404a50ec1f32 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/RequestFilterTest.java @@ -73,9 +73,9 @@ public void testGetFilteredHeaders() { RequestFilter.getFilteredHeaders(headers, ActionType.PRE_ISSUE_ACCESS_TOKEN); assertEquals(filteredHeaders.size(), 2); filteredHeaders.forEach(filteredHeader -> { - if (filteredHeader.getName().equalsIgnoreCase("Content-Type")) { + if (filteredHeader.getName().equals("Content-Type")) { assertEquals(filteredHeader.getValue(), new String[]{"application/json"}); - } else if (filteredHeader.getName().equalsIgnoreCase("X-Header-3")) { + } else if (filteredHeader.getName().equals("X-Header-3")) { assertEquals(filteredHeader.getValue(), new String[]{"X-header-3-value"}); } });