From d806f914d7e97fcb5467e77bbd13e21fcdee4434 Mon Sep 17 00:00:00 2001 From: Zack Goodwin Date: Thu, 21 Mar 2024 18:23:51 -0400 Subject: [PATCH] PROC-1643: Remove quotes --- .../com/indeed/proctor/consumer/ProctorConsumerUtils.java | 5 +---- .../proctor/consumer/spring/TestProctorConsumerUtils.java | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/proctor-consumer/src/main/java/com/indeed/proctor/consumer/ProctorConsumerUtils.java b/proctor-consumer/src/main/java/com/indeed/proctor/consumer/ProctorConsumerUtils.java index 15156f3e8..de73fd24e 100644 --- a/proctor-consumer/src/main/java/com/indeed/proctor/consumer/ProctorConsumerUtils.java +++ b/proctor-consumer/src/main/java/com/indeed/proctor/consumer/ProctorConsumerUtils.java @@ -217,10 +217,7 @@ private static Cookie doCreateForcedGroupsCookie( final String contextPath, final ForceGroupsOptions forceGroupsOptions) { // be sure to quote cookies because they have characters that are not allowed raw final String cookieValue = - '"' - + ForceGroupsOptionsStrings.generateForceGroupsStringForCookies( - forceGroupsOptions) - + '"'; + ForceGroupsOptionsStrings.generateForceGroupsStringForCookies(forceGroupsOptions); final String cookiePath; if (StringUtils.isBlank(contextPath)) { diff --git a/proctor-consumer/src/test/java/com/indeed/proctor/consumer/spring/TestProctorConsumerUtils.java b/proctor-consumer/src/test/java/com/indeed/proctor/consumer/spring/TestProctorConsumerUtils.java index d1ba33aad..89d8c2f26 100644 --- a/proctor-consumer/src/test/java/com/indeed/proctor/consumer/spring/TestProctorConsumerUtils.java +++ b/proctor-consumer/src/test/java/com/indeed/proctor/consumer/spring/TestProctorConsumerUtils.java @@ -313,13 +313,13 @@ public void testSetForcedGroupsCookie() { public void testCreateForcedGroupsCookie() { Cookie cookie = createForcedGroupsCookie("myapp", emptyMap()); assertThat(cookie.getName()).isEqualTo("prforceGroups"); - assertThat(cookie.getValue()).isEqualTo("\"\""); + assertThat(cookie.getValue()).isEqualTo(""); assertThat(cookie.getPath()).isEqualTo("myapp"); assertThat(cookie.getVersion()).isEqualTo(0); cookie = createForcedGroupsCookie("myapp", Collections.singletonMap("foo", 2)); assertThat(cookie.getName()).isEqualTo("prforceGroups"); - assertThat(cookie.getValue()).isEqualTo("\"foo2\""); + assertThat(cookie.getValue()).isEqualTo("foo2"); assertThat(cookie.getPath()).isEqualTo("myapp"); assertThat(cookie.getVersion()).isEqualTo(0); @@ -328,7 +328,7 @@ public void testCreateForcedGroupsCookie() { forceGroups.put("bar", 3); cookie = createForcedGroupsCookie("myapp", forceGroups); assertThat(cookie.getName()).isEqualTo("prforceGroups"); - assertThat(cookie.getValue()).isEqualTo("\"bar3%2Cfoo2\""); + assertThat(cookie.getValue()).isEqualTo("bar3%2Cfoo2"); assertThat(cookie.getPath()).isEqualTo("myapp"); assertThat(cookie.getVersion()).isEqualTo(0); @@ -337,7 +337,7 @@ public void testCreateForcedGroupsCookie() { final String forceGroup = getForceGroupsStringFromRequest(request); - assertThat(forceGroup).isEqualTo("\"bar3,foo2\""); + assertThat(forceGroup).isEqualTo("bar3,foo2"); } @Test