From 215f8403a6c4a131b9592457fd95a280274237de Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Thu, 23 Sep 2021 11:16:04 -0500 Subject: Fix code quality issues --- .../server/authentication/OAuth2AuthenticationParametersImpl.java | 5 ----- .../org/sonar/server/authentication/OAuth2CallbackFilterTest.java | 6 +++--- .../org/sonar/server/authentication/ResetPasswordFilterTest.java | 6 +++--- 3 files changed, 6 insertions(+), 11 deletions(-) (limited to 'server/sonar-webserver-auth') diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java index 207d2736f27..dba73b81525 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java @@ -52,11 +52,6 @@ public class OAuth2AuthenticationParametersImpl implements OAuth2AuthenticationP */ private static final String RETURN_TO_PARAMETER = "return_to"; - /** - * This parameter is used to allow the update of login - */ - private static final String ALLOW_LOGIN_UPDATE_PARAMETER = "allowUpdateLogin"; - private static final Type JSON_MAP_TYPE = new TypeToken>() { }.getType(); diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java index 6c45615d3bf..503b8be6149 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java @@ -168,7 +168,7 @@ public class OAuth2CallbackFilterTest { assertThat(authenticationException.getSource()).isEqualTo(Source.oauth2(identityProvider)); assertThat(authenticationException.getLogin()).isNull(); assertThat(authenticationException.getPublicMessage()).isEqualTo("Email john@email.com is already used"); - verify(oAuthRedirection).delete(eq(request), eq(response)); + verify(oAuthRedirection).delete(request, response); verify(response).addCookie(cookieArgumentCaptor.capture()); Cookie cookie = cookieArgumentCaptor.getValue(); @@ -190,7 +190,7 @@ public class OAuth2CallbackFilterTest { underTest.doFilter(request, response, chain); verify(response).sendRedirect("/sonarqube/sessions/unauthorized"); - verify(oAuthRedirection).delete(eq(request), eq(response)); + verify(oAuthRedirection).delete(request, response); } @Test @@ -203,7 +203,7 @@ public class OAuth2CallbackFilterTest { verify(response).sendRedirect("/sessions/unauthorized"); assertThat(logTester.logs(LoggerLevel.WARN)).containsExactlyInAnyOrder("Fail to callback authentication with 'failing'"); - verify(oAuthRedirection).delete(eq(request), eq(response)); + verify(oAuthRedirection).delete(request, response); } @Test diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/ResetPasswordFilterTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/ResetPasswordFilterTest.java index 8a0dd6ac2b7..319b9a27bf4 100644 --- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/ResetPasswordFilterTest.java +++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/ResetPasswordFilterTest.java @@ -73,7 +73,7 @@ public class ResetPasswordFilterTest { public void redirect_if_reset_password_set() throws Exception { underTest.doFilter(request, response, chain); - verify(response).sendRedirect(eq("/account/reset_password")); + verify(response).sendRedirect("/account/reset_password"); } @Test @@ -82,7 +82,7 @@ public class ResetPasswordFilterTest { underTest.doFilter(request, response, chain); - verify(response).sendRedirect(eq("/sonarqube/account/reset_password")); + verify(response).sendRedirect("/sonarqube/account/reset_password"); } @Test @@ -92,7 +92,7 @@ public class ResetPasswordFilterTest { underTest.doFilter(request, response, chain); - verify(response).sendRedirect(eq("/sonarqube/account/reset_password")); + verify(response).sendRedirect("/sonarqube/account/reset_password"); } @Test -- cgit v1.2.3