diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 93f1e77dc8b..26e56f54736 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -52,7 +52,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: 'liberica' - java-version: '21' + java-version: '25' cache: 'gradle' if: ${{ matrix.language == 'java' }} diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 350e17e22ce..5db75e10ccf 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: 'liberica' - java-version: '21' + java-version: '25' cache: 'gradle' - name: Login to Docker Hub uses: docker/login-action@v3 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 048e842f635..834e19b43f6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '21', '25' ] + java: [ '25' ] steps: - uses: actions/checkout@v6 - uses: actions/setup-java@v5 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 09b466cab64..e5f4986791a 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'liberica' - java-version: '21' + java-version: '25' cache: 'gradle' - name: Analyze with SonarCloud env: diff --git a/build.gradle b/build.gradle index 3ae4d33a935..e25c3346aac 100644 --- a/build.gradle +++ b/build.gradle @@ -43,12 +43,11 @@ allprojects { } } - subprojects { apply(plugin: "java") java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } configurations.configureEach { diff --git a/metrics-data/src/main/java/org/cloudfoundry/identity/uaa/metrics/MetricsQueue.java b/metrics-data/src/main/java/org/cloudfoundry/identity/uaa/metrics/MetricsQueue.java index f388ce4e1ad..2c15e9cac9f 100644 --- a/metrics-data/src/main/java/org/cloudfoundry/identity/uaa/metrics/MetricsQueue.java +++ b/metrics-data/src/main/java/org/cloudfoundry/identity/uaa/metrics/MetricsQueue.java @@ -92,7 +92,7 @@ public RequestMetricSummary getTotals() { MutableDouble averageDatabaseQueryTime = new MutableDouble(0); MutableLong databaseIntolerableQueryCount = new MutableLong(0); MutableDouble averageDatabaseIntolerableQueryTime = new MutableDouble(0); - statistics.forEach((key, summary) -> { + statistics.forEach((_, summary) -> { averageTime.set(addAverages(count.get(), averageTime.get(), summary.getCount(), diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplate.java b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplate.java index eb34639aa73..48d36674634 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplate.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplate.java @@ -139,7 +139,7 @@ protected T doExecute(URI url, HttpMethod method, RequestCallback requestCal catch (AccessTokenRequiredException | OAuth2AccessDeniedException e) { rethrow = e; } - catch (InvalidTokenException e) { + catch (InvalidTokenException _) { // Don't reveal the token value in case it is logged rethrow = new OAuth2AccessDeniedException("Invalid token for client=" + getClientId()); } @@ -148,7 +148,7 @@ protected T doExecute(URI url, HttpMethod method, RequestCallback requestCal try { return super.doExecute(url, method, requestCallback, responseExtractor); } - catch (InvalidTokenException e) { + catch (InvalidTokenException _) { // Don't reveal the token value in case it is logged rethrow = new OAuth2AccessDeniedException("Invalid token for client=" + getClientId()); } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/grant/AuthorizationCodeAccessTokenProvider.java b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/grant/AuthorizationCodeAccessTokenProvider.java index f257bd17f0f..5d3c805bb40 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/grant/AuthorizationCodeAccessTokenProvider.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/grant/AuthorizationCodeAccessTokenProvider.java @@ -147,7 +147,7 @@ public OAuth2AccessToken refreshAccessToken(OAuth2ProtectedResourceDetails resou try { return retrieveToken(request, resource, form, getHeadersForTokenRequest()); } - catch (OAuth2AccessDeniedException e) { + catch (OAuth2AccessDeniedException _) { throw getRedirectForAuthorization((AuthorizationCodeResourceDetails) resource, request); } } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/http/OAuth2ErrorHandler.java b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/http/OAuth2ErrorHandler.java index 4bd4a604461..4db463fc4e1 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/http/OAuth2ErrorHandler.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/client/http/OAuth2ErrorHandler.java @@ -124,10 +124,7 @@ public int getRawStatusCode() throws IOException { throw oauth2Exception; } } - catch (RestClientException e) { - // ignore - } - catch (HttpMessageConversionException e) { + catch (RestClientException | HttpMessageConversionException _) { // ignore } @@ -143,7 +140,7 @@ public int getRawStatusCode() throws IOException { // then delegate to the custom handler errorHandler.handleError(bufferedResponse); } - catch (InvalidTokenException ex) { + catch (InvalidTokenException _) { // Special case: an invalid token can be renewed so tell the caller what to do throw new AccessTokenRequiredException(resource); } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/DefaultOAuth2AccessToken.java b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/DefaultOAuth2AccessToken.java index 4b7a3453fa5..ebe74a57da3 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/DefaultOAuth2AccessToken.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/DefaultOAuth2AccessToken.java @@ -144,7 +144,7 @@ public static OAuth2AccessToken valueOf(Map tokenParams) { // Convert to string before parseLong, tokenParams is not always a Map might contain Integer expiration = Long.parseLong(String.valueOf(tokenParams.get(EXPIRES_IN))); } - catch (NumberFormatException e) { + catch (NumberFormatException _) { // fall through... } token.setExpiration(new Date(System.currentTimeMillis() + (expiration * 1000L))); diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2Deserializer.java b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2Deserializer.java index b94dd986551..9cb3b07afe6 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2Deserializer.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2Deserializer.java @@ -58,7 +58,7 @@ public OAuth2AccessToken deserialize(JsonParser jp, DeserializationContext ctxt) } else if (OAuth2AccessToken.EXPIRES_IN.equals(name)) { try { expiresIn = jp.getLongValue(); - } catch (JsonParseException e) { + } catch (JsonParseException _) { expiresIn = Long.valueOf(jp.getText()); } } else if (OAuth2AccessToken.SCOPE.equals(name)) { diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/OAuth2AccessTokenSupport.java b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/OAuth2AccessTokenSupport.java index 939ce95c958..3845d3c1cd9 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/OAuth2AccessTokenSupport.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/OAuth2AccessTokenSupport.java @@ -239,7 +239,7 @@ public void handleError(ClientHttpResponse response) throws IOException { try { ex = ((HttpMessageConverter) converter).read(OAuth2Exception.class, response); } - catch (Exception e) { + catch (Exception _) { // ignore continue; } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/provider/SamlIdentityProviderDefinition.java b/model/src/main/java/org/cloudfoundry/identity/uaa/provider/SamlIdentityProviderDefinition.java index 42cc1116a7b..034e5712909 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/provider/SamlIdentityProviderDefinition.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/provider/SamlIdentityProviderDefinition.java @@ -104,7 +104,7 @@ public static MetadataLocation getType(String urlOrXmlData) { // Check if it is a valid URL new URL(trimmedValue); return MetadataLocation.URL; - } catch (MalformedURLException e) { + } catch (MalformedURLException _) { //invalid URL } } @@ -128,7 +128,7 @@ private static boolean validateXml(String xml) { try { DocumentBuilder builder = ObjectUtils.getDocumentBuilder(); builder.parse(new InputSource(new StringReader(xml))); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException _) { return false; } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/util/UaaStringUtils.java b/model/src/main/java/org/cloudfoundry/identity/uaa/util/UaaStringUtils.java index 3f7661196e1..eb9f22fe07b 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/util/UaaStringUtils.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/util/UaaStringUtils.java @@ -243,7 +243,8 @@ public static String getHostIfArgIsURL(String arg) { try { URL uri = new URL(arg); return uri.getHost(); - } catch (MalformedURLException ignored) { + } catch (MalformedURLException _) { + // ignore } return arg; } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneConfiguration.java b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneConfiguration.java index dde8aed2345..e0884e951f1 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneConfiguration.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneConfiguration.java @@ -80,7 +80,7 @@ public void setIssuer(String issuer) { try { new URL(issuer); this.issuer = issuer; - } catch (MalformedURLException e) { + } catch (MalformedURLException _) { throw new IllegalArgumentException("Invalid issuer format. Must be valid URL."); } } diff --git a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/SamlConfig.java b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/SamlConfig.java index ff9b1d29cd4..2df9627f43d 100644 --- a/model/src/main/java/org/cloudfoundry/identity/uaa/zone/SamlConfig.java +++ b/model/src/main/java/org/cloudfoundry/identity/uaa/zone/SamlConfig.java @@ -56,9 +56,9 @@ public void setEntityID(String entityID) { @JsonProperty("certificate") public void setCertificate(String certificate) { if (hasText(certificate)) { - keys.computeIfAbsent(LEGACY_KEY_ID, k -> new SamlKey()); + keys.computeIfAbsent(LEGACY_KEY_ID, _ -> new SamlKey()); } - keys.computeIfPresent(LEGACY_KEY_ID, (k, v) -> { + keys.computeIfPresent(LEGACY_KEY_ID, (_, v) -> { v.setCertificate(certificate); return v; }); @@ -67,9 +67,9 @@ public void setCertificate(String certificate) { @JsonProperty("privateKey") public void setPrivateKey(String privateKey) { if (hasText(privateKey)) { - keys.computeIfAbsent(LEGACY_KEY_ID, k -> new SamlKey()); + keys.computeIfAbsent(LEGACY_KEY_ID, _ -> new SamlKey()); } - keys.computeIfPresent(LEGACY_KEY_ID, (k, v) -> { + keys.computeIfPresent(LEGACY_KEY_ID, (_, v) -> { v.setKey(privateKey); return v; }); @@ -78,9 +78,9 @@ public void setPrivateKey(String privateKey) { @JsonProperty("privateKeyPassword") public void setPrivateKeyPassword(String privateKeyPassword) { if (hasText(privateKeyPassword)) { - keys.computeIfAbsent(LEGACY_KEY_ID, k -> new SamlKey()); + keys.computeIfAbsent(LEGACY_KEY_ID, _ -> new SamlKey()); } - keys.computeIfPresent(LEGACY_KEY_ID, (k, v) -> { + keys.computeIfPresent(LEGACY_KEY_ID, (_, v) -> { v.setPassphrase(privateKeyPassword); return v; }); diff --git a/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplateTests.java b/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplateTests.java index 330a6dfb7d3..149ce5618cd 100644 --- a/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplateTests.java +++ b/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/OAuth2RestTemplateTests.java @@ -161,7 +161,7 @@ void doubleEncodingOfAccessTokenValue() { @Test void noRetryAccessDeniedExceptionForNoExistingToken() { restTemplate.setAccessTokenProvider(new StubAccessTokenProvider()); - restTemplate.setRequestFactory((uri, httpMethod) -> { + restTemplate.setRequestFactory((_, _) -> { throw new AccessTokenRequiredException(resource); }); assertThatExceptionOfType(AccessTokenRequiredException.class).isThrownBy(() -> @@ -300,7 +300,7 @@ public OAuth2AccessToken obtainAccessToken(OAuth2ProtectedResourceDetails detail OAuth2AccessToken newToken = restTemplate.getAccessToken(); assertThat(newToken).isNotNull(); fail("Expected UserRedirectRequiredException"); - } catch (UserRedirectRequiredException e) { + } catch (UserRedirectRequiredException _) { // planned } // context token should be reset as it is invalid at this point diff --git a/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/token/grant/AuthorizationCodeAccessTokenProviderWithConversionTests.java b/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/token/grant/AuthorizationCodeAccessTokenProviderWithConversionTests.java index d273f6cf8cb..7e5f728abb5 100644 --- a/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/token/grant/AuthorizationCodeAccessTokenProviderWithConversionTests.java +++ b/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/client/token/grant/AuthorizationCodeAccessTokenProviderWithConversionTests.java @@ -197,7 +197,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) { void getErrorFromForm() { final HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setContentType(MediaType.APPLICATION_FORM_URLENCODED); - requestFactory = (uri, httpMethod) -> new StubClientHttpRequest(HttpStatus.BAD_REQUEST, responseHeaders, + requestFactory = (_, _) -> new StubClientHttpRequest(HttpStatus.BAD_REQUEST, responseHeaders, "error=invalid_client&error_description=FOO"); AccessTokenRequest request = new DefaultAccessTokenRequest(); request.setAuthorizationCode("foo"); diff --git a/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2SerializerTests.java b/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2SerializerTests.java index 52a386e51b4..6e909d58379 100644 --- a/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2SerializerTests.java +++ b/model/src/test/java/org/cloudfoundry/identity/uaa/oauth/common/OAuth2AccessTokenJackson2SerializerTests.java @@ -58,7 +58,7 @@ void writeValueAsStringWithNullScope() { accessToken.getScope().clear(); try { accessToken.getScope().add(null); - } catch (NullPointerException e) { + } catch (NullPointerException _) { // short circuit NPE from Java 7 (which is correct but only relevant for this test) throw new JsonMappingException("Scopes cannot be null or empty. Got [null]"); } diff --git a/model/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java b/model/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java index a28643ec96c..572fedfe869 100644 --- a/model/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java +++ b/model/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java @@ -556,7 +556,7 @@ void patchUserChangeUserName() { try { user.patch(patch); fail("username is a required field, can't nullify it."); - } catch (IllegalArgumentException ignored) { + } catch (IllegalArgumentException _) { // ignore } assertThat(user.getUserName()).isNotNull(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java index 6957f26234c..643a88928bc 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/AccountsController.java @@ -86,7 +86,7 @@ public String sendActivationEmail(Model model, HttpServletResponse response, } try { accountCreationService.beginActivation(email.getEmail(), password, clientId, redirectUri); - } catch (UaaException e) { + } catch (UaaException _) { return handleUnprocessableEntity(model, response, "error_message_code", "username_exists"); } catch (InvalidPasswordException e) { return handleUnprocessableEntity(model, response, "error_message", e.getMessagesAsOneString()); @@ -113,7 +113,7 @@ public String verifyUser(Model model, AccountCreationService.AccountCreationResponse accountCreation; try { accountCreation = accountCreationService.completeActivation(code); - } catch (HttpClientErrorException e) { + } catch (HttpClientErrorException _) { model.addAttribute("error_message_code", "code_expired"); response.setStatus(HttpStatus.UNPROCESSABLE_ENTITY.value()); return "accounts/link_prompt"; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java index 6be1cf79163..e00a7abe32f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangeEmailController.java @@ -93,14 +93,14 @@ public String verifyEmail(Model model, @RequestParam String code, RedirectAttrib try { response = changeEmailService.completeVerification(code); - } catch (UaaException e) { + } catch (UaaException _) { return handleExceptionConsideringAuthentication(model, httpServletResponse); } UaaUser user; try { user = uaaUserDatabase.retrieveUserById(response.get("userId")); - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { return handleExceptionConsideringAuthentication(model, httpServletResponse); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java index 87427ad2b12..3fadaf2945f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ChangePasswordController.java @@ -61,7 +61,7 @@ public String changePassword( } securityContext.setAuthentication(authentication); return "redirect:profile"; - } catch (BadCredentialsException e) { + } catch (BadCredentialsException _) { model.addAttribute("message_code", "unauthorized"); } catch (InvalidPasswordException e) { model.addAttribute("message", e.getMessagesAsOneString()); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java index 97b86c6552b..876d45e12bd 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailAccountCreationService.java @@ -80,7 +80,7 @@ public void beginActivation(String email, String password, String clientId, Stri try { ScimUser scimUser = createUser(email, password, OriginKeys.UAA); generateAndSendCode(email, clientId, subject, scimUser.getId(), redirectUri, identityZoneManager.getCurrentIdentityZone()); - } catch (ScimResourceAlreadyExistsException e) { + } catch (ScimResourceAlreadyExistsException _) { List users = scimUserProvisioning.retrieveByUsernameAndOriginAndZone(email, OriginKeys.UAA, identityZoneManager.getCurrentIdentityZoneId()); if (!users.isEmpty()) { if (users.getFirst().isVerified()) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailService.java index 92606560c19..a7d2cc97c34 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailService.java @@ -128,7 +128,8 @@ public Map completeVerification(String code) { clientDetails.getRegisteredRedirectUri(); String changeEmailRedirectUrl = (String) clientDetails.getAdditionalInformation().get(CHANGE_EMAIL_REDIRECT_URL); redirectLocation = findMatchingRedirectUri(redirectUris, redirectUri, changeEmailRedirectUrl); - } catch (NoSuchClientException ignored) { + } catch (NoSuchClientException _) { + // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java index edc49655c87..a00b28a415b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/PasswordResetEndpoint.java @@ -82,7 +82,7 @@ public ResponseEntity resetPassword(@RequestBody String e } catch (ConflictException e) { response.setUserId(e.getUserId()); return new ResponseEntity<>(response, CONFLICT); - } catch (NotFoundException e) { + } catch (NotFoundException _) { return new ResponseEntity<>(NOT_FOUND); } } @@ -110,13 +110,13 @@ public ResponseEntity changePassword(@RequestBody Lo response.setEmail(user.getPrimaryEmail()); response.setLoginCode(loginCode.getCode()); return new ResponseEntity<>(response, OK); - } catch (BadCredentialsException e) { + } catch (BadCredentialsException _) { return new ResponseEntity<>(UNAUTHORIZED); - } catch (ScimResourceNotFoundException e) { + } catch (ScimResourceNotFoundException _) { return new ResponseEntity<>(NOT_FOUND); } catch (InvalidPasswordException | InvalidCodeException e) { throw e; - } catch (Exception e) { + } catch (Exception _) { return new ResponseEntity<>(INTERNAL_SERVER_ERROR); } } else { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java index b85e85ae0fc..7447a37e074 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ProfileController.java @@ -149,7 +149,7 @@ private Map> getCurrentApprovalsForUser(String u for (DescribedApproval approval : approvals) { List clientApprovals = result.computeIfAbsent( approval.getClientId(), - k -> new ArrayList<>() + _ -> new ArrayList<>() ); String scope = approval.getScope(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java index 6325801ec5c..bad000cf73d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/ResetPasswordController.java @@ -109,7 +109,7 @@ private void forgotPassword(String username, String clientId, String redirectUri email = e.getEmail(); htmlContent = getResetUnavailableEmailHtml(email); userId = e.getUserId(); - } catch (NotFoundException e) { + } catch (NotFoundException _) { logger.error("User with email address {} not found.", username); } @@ -210,7 +210,7 @@ private ExpiringCode checkIfUserExists(ExpiringCode code) { String userId = data.get("user_id"); try { userDatabase.retrieveUserById(userId); - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { logger.debug("reset_password ExpiringCode[{}] user_id is invalid. Aborting.", code.getCode()); return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java index 3f34284f2df..b0256990e4f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java @@ -96,7 +96,7 @@ private ResetPasswordResponse changePasswordCodeAuthenticated(ExpiringCode expir PasswordChange change; try { change = JsonUtils.readValue(expiringCode.getData(), PasswordChange.class); - } catch (JsonUtils.JsonUtilException x) { + } catch (JsonUtils.JsonUtilException _) { throw new InvalidCodeException("invalid_code", "Sorry, your reset password link is no longer valid. Please request a new one", 422); } userId = change.getUserId(); @@ -131,7 +131,8 @@ private ResetPasswordResponse changePasswordCodeAuthenticated(ExpiringCode expir if (matchingRedirectUri != null) { redirectLocation = matchingRedirectUri; } - } catch (NoSuchClientException nsce) { + } catch (NoSuchClientException _) { + // ignore } } return new ResetPasswordResponse(user, redirectLocation, clientId); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/event/PasswordChangeEventPublisher.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/event/PasswordChangeEventPublisher.java index c3f47b4771e..2bde0b57da4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/event/PasswordChangeEventPublisher.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/event/PasswordChangeEventPublisher.java @@ -76,7 +76,7 @@ UaaUser getUser(String userId) { scimUser.getSalt(), scimUser.getPasswordLastModified()); } - } catch (ScimResourceNotFoundException e) { + } catch (ScimResourceNotFoundException _) { // ignore } return null; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandler.java index 5870e1426d6..22a2443fc8b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandler.java @@ -76,7 +76,7 @@ public final boolean aliasPropertiesAreValid( // the referenced zone must exist try { identityZoneProvisioning.retrieve(requestBody.getAliasZid()); - } catch (final ZoneDoesNotExistsException e) { + } catch (final ZoneDoesNotExistsException _) { LOGGER.debug("Zone referenced in alias zone ID does not exist."); return false; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java index 6bd274cf44d..735b7e13101 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/ApprovalsAdminEndpoints.java @@ -187,7 +187,7 @@ private boolean isValidUser(String userId) { try { userDatabase.retrieveUserById(userId); return true; - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { return false; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java index cacfd295403..4c0d30d77c0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java @@ -113,7 +113,7 @@ public boolean addApproval(final Approval approval, final String zoneId) { } try { refreshApproval(approval, zoneId); // try to refresh the approval - } catch (DataIntegrityViolationException ex) { // could not find the + } catch (DataIntegrityViolationException _) { // could not find the // approval. add it. int count = jdbcTemplate.update(ADD_AUTHZ_SQL, ps -> { ps.setString(1, approval.getUserId()); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/audit/event/AbstractUaaEvent.java b/server/src/main/java/org/cloudfoundry/identity/uaa/audit/event/AbstractUaaEvent.java index 7b5461c0a73..63932229ce9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/audit/event/AbstractUaaEvent.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/audit/event/AbstractUaaEvent.java @@ -122,7 +122,7 @@ private String getAuthenticationString(Authentication caller) { builder.append("remoteAddress=").append(map.get("remoteAddress")).append(", "); } builder.append("type=").append(caller.getDetails().getClass().getSimpleName()); - } catch (Exception e) { + } catch (Exception _) { // ignore builder.append(caller.getDetails()); } @@ -148,7 +148,7 @@ protected void appendTokenDetails(Authentication caller, StringBuilder builder) String issuer = claims.get(ClaimConstants.ISS).toString(); String subject = claims.get(ClaimConstants.SUB).toString(); builder.append(", sub=").append(subject).append(", ").append("iss=").append(issuer); - } catch (Exception e) { + } catch (Exception _) { builder.append(", "); } } else { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java index 352497bb412..2bc0a9d9e4b 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/ClientBasicAuthenticationFilter.java @@ -104,7 +104,7 @@ protected void doFilterInternal(HttpServletRequest request, try { clientId = URLDecoder.decode(tokens[0], getCredentialsCharset(request)); clientSecret = URLDecoder.decode(tokens[1], getCredentialsCharset(request)); - } catch (UnsupportedEncodingException | IllegalArgumentException e) { + } catch (UnsupportedEncodingException | IllegalArgumentException _) { throw new BadCredentialsException("Failed to URL Decode credentials"); } } @@ -155,7 +155,7 @@ private String[] extractAndDecodeHeader(String header, HttpServletRequest reques try { decoded = Base64.getDecoder().decode(base64Token); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException _) { throw new BadCredentialsException( "Failed to decode basic authentication token"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/Origin.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/Origin.java index 97393699288..cb1b6758407 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/Origin.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/Origin.java @@ -50,7 +50,8 @@ public static String getUserIdThroughReflection(Authentication authentication, S if (id != null) { return id.toString(); } - } catch (Exception ignored) { + } catch (Exception _) { + // ignore } return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java index b7532a4eb64..f727afd43d4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/PasscodeAuthenticationFilter.java @@ -210,7 +210,7 @@ public Authentication authenticate(Authentication authentication) throws Authent try { UaaUser user = uaaUserDatabase.retrieveUserById(pi.getUserId()); authorities = user.getAuthorities(); - } catch (UsernameNotFoundException x) { + } catch (UsernameNotFoundException _) { throw new BadCredentialsException("Invalid user."); } Authentication result = new UsernamePasswordAuthenticationToken( diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java index 74f2779a40c..1f4c03104e2 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/RemoteAuthenticationEndpoint.java @@ -63,10 +63,10 @@ public HttpEntity authenticate(HttpServletRequest reques } processAdditionalInformation(response, a); status = HttpStatus.OK; - } catch (AccountNotVerifiedException e) { + } catch (AccountNotVerifiedException _) { response.setError("account not verified"); status = HttpStatus.FORBIDDEN; - } catch (AuthenticationException e) { + } catch (AuthenticationException _) { response.setError("authentication failed"); } catch (Exception e) { logger.debug("Failed to authenticate user ", e); @@ -104,7 +104,7 @@ public HttpEntity authenticate(HttpServletRequest reques response.setUsername(a.getName()); processAdditionalInformation(response, a); status = HttpStatus.OK; - } catch (AuthenticationException e) { + } catch (AuthenticationException _) { response.setError("authentication failed"); } catch (Exception e) { logger.debug("Failed to authenticate user ", e); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java index ad21cec9249..1afa3e0f87f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilter.java @@ -84,7 +84,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse redirect = true; } } - } catch (UsernameNotFoundException x) { + } catch (UsernameNotFoundException _) { logger.info("Authenticated user [{}] was not found in DB.", userId); redirect = true; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaLoginHint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaLoginHint.java index e11f0fc39ef..1419b392f4f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaLoginHint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/UaaLoginHint.java @@ -22,7 +22,7 @@ public static UaaLoginHint parseRequestParameter(String loginHint) { try { loginHint = URLDecoder.decode(loginHint, StandardCharsets.UTF_8); return mapper.readValue(loginHint, UaaLoginHint.class); - } catch (IOException e) { + } catch (IOException _) { return null; } } @@ -46,7 +46,7 @@ public void setOrigin(String origin) { public String toString() { try { return mapper.writeValueAsString(this); - } catch (JsonProcessingException e) { + } catch (JsonProcessingException _) { return super.toString(); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutSuccessHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutSuccessHandler.java index 1ad34b5a109..263a235d9fa 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutSuccessHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/WhitelistLogoutSuccessHandler.java @@ -62,7 +62,7 @@ private Set getClientWhitelist(HttpServletRequest request) { List signatureVerifiers = keys.values().stream().map(KeyInfo::getVerifier).toList(); JwtTokenSignedByThisUAA jwtToken = buildIdTokenValidator(idToken, new ChainedSignatureVerifier(signatureVerifiers), keyInfoService); clientId = (String) jwtToken.getClaims().get(ClaimConstants.AZP); - } catch (InvalidTokenException e) { + } catch (InvalidTokenException _) { log.debug("Invalid token (could not verify signature)"); } } else { @@ -73,7 +73,7 @@ private Set getClientWhitelist(HttpServletRequest request) { try { ClientDetails client = clientDetailsService.loadClientByClientId(clientId, IdentityZoneHolder.get().getId()); redirectUris = client.getRegisteredRedirectUri(); - } catch (NoSuchClientException x) { + } catch (NoSuchClientException _) { log.debug("Unable to find client with ID:%s for logout redirect".formatted(clientId)); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/UserNotFoundEvent.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/UserNotFoundEvent.java index 7f70271b33b..456c955181c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/UserNotFoundEvent.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/UserNotFoundEvent.java @@ -43,7 +43,7 @@ public AuditEvent getAuditEvent() { // Store hash of name, to conceal accidental entry of sensitive info // (e.g. password) name = Utf8.decode(Base64.encode(MessageDigest.getInstance("SHA-1").digest(Utf8.encode(name)))); - } catch (NoSuchAlgorithmException shouldNeverHappen) { + } catch (NoSuchAlgorithmException _) { name = "NOSHA"; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java index f847109f163..c8f81f9212a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthzAuthenticationManager.java @@ -166,7 +166,8 @@ private UaaUser getUaaUser(Authentication req) { if (user != null) { return user; } - } catch (UsernameNotFoundException ignored) { + } catch (UsernameNotFoundException _) { + // ignore } return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AutologinAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AutologinAuthenticationManager.java index b76a1202999..18682a49b30 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AutologinAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AutologinAuthenticationManager.java @@ -108,7 +108,7 @@ public Authentication authenticate(Authentication authentication) throws Authent try { clientDetailsService.loadClientByClientId(clientId, IdentityZoneHolder.get().getId()); - } catch (NoSuchClientException x) { + } catch (NoSuchClientException _) { throw new BadCredentialsException("Cannot redeem provided code for user, client is missing"); } @@ -116,7 +116,7 @@ public Authentication authenticate(Authentication authentication) throws Authent try { user = userDatabase.retrieveUserById(userId); - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { throw new BadCredentialsException("Cannot redeem provided code for user, user is missing"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/CheckIdpEnabledAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/CheckIdpEnabledAuthenticationManager.java index 010e8d08783..0c02b012ce1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/CheckIdpEnabledAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/CheckIdpEnabledAuthenticationManager.java @@ -49,7 +49,7 @@ public Authentication authenticate(final Authentication authentication) throws A if (!idp.isActive()) { throw new ProviderNotFoundException("Identity Provider \"" + idp.getName() + "\" has been disabled by administrator."); } - } catch (EmptyResultDataAccessException x) { + } catch (EmptyResultDataAccessException _) { throw new ProviderNotFoundException("Unable to find identity provider for origin: " + getOrigin()); } return delegate.authenticate(authentication); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManager.java index 00f35bce8f3..9fa0d97c6eb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManager.java @@ -137,7 +137,8 @@ protected IdentityProvider getProvider(String origin, IdentityZone zone) { if (result != null) { return result; } - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { + // ignore } IdentityProvider provider = new IdentityProvider(); provider.setOriginKey(origin); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManager.java index 6def53fc23e..3d9380b0c28 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManager.java @@ -111,7 +111,7 @@ public Authentication authenticate(Authentication request) throws Authentication try { logger.debug("Searching for user by (username:{} , origin:{})", userFromRequest.getUsername(), origin); userFromDb = userDatabase.retrieveUserByName(userFromRequest.getUsername(), origin); - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { logger.debug("Searching for user by (email:{} , origin:{})", userFromRequest.getEmail(), origin); userFromDb = userDatabase.retrieveUserByEmail(userFromRequest.getEmail(), origin); } @@ -124,7 +124,7 @@ public Authentication authenticate(Authentication request) throws Authentication publish(new NewUserAuthenticatedEvent(userFromRequest.authorities(List.of()))); try { userFromDb = userDatabase.retrieveUserByName(userFromRequest.getUsername(), origin); - } catch (UsernameNotFoundException ex) { + } catch (UsernameNotFoundException _) { throw new BadCredentialsException("Unable to register user in internal UAA store."); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/LoginAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/LoginAuthenticationManager.java index 483622285bd..8fa13acc21c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/LoginAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/LoginAuthenticationManager.java @@ -86,14 +86,14 @@ public Authentication authenticate(Authentication request) throws Authentication addNewAccounts = false; user = userDatabase.retrieveUserById(user.getId()); } - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { // Not necessarily fatal if (addNewAccounts) { // Register new users automatically publish(new NewUserAuthenticatedEvent(user)); try { user = userDatabase.retrieveUserByName(user.getUsername(), user.getOrigin()); - } catch (UsernameNotFoundException ex) { + } catch (UsernameNotFoundException _) { throw new BadCredentialsException("Bad credentials"); } } else { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManager.java index 87db9773f22..3aeb3dd215a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManager.java @@ -98,7 +98,7 @@ && providerSupportsPasswordGrant(retrievedByOrigin) && (allowedProviders == null || allowedProviders.contains(useOrigin))) { return retrievedByOrigin; } - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminBootstrap.java index 955596874b9..92daa4a23bc 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminBootstrap.java @@ -121,7 +121,7 @@ private void updateAutoApproveClients() { base.addAdditionalInformation(ClientConstants.AUTO_APPROVE, true); logger.debug("Adding autoapprove flag to client: {}", clientId); clientRegistrationService.updateClientDetails(base, IdentityZone.getUaaZoneId()); - } catch (NoSuchClientException n) { + } catch (NoSuchClientException _) { logger.debug("Client not found, unable to set autoapprove: {}", clientId); } } @@ -135,7 +135,7 @@ private void updateAllowedPublicClients() { base.addAdditionalInformation(ClientConstants.ALLOW_PUBLIC, true); logger.debug("Adding allowpublic flag to client: {}", clientId); clientRegistrationService.updateClientDetails(base, IdentityZone.getUaaZoneId()); - } catch (NoSuchClientException n) { + } catch (NoSuchClientException _) { logger.debug("Client not found, unable to set allowpublic: {}", clientId); } } @@ -326,7 +326,7 @@ public void onApplicationEvent(ContextRefreshedEvent ignored) { logger.debug("Deleting client from manifest:{}", clientId); EntityDeletedEvent delete = new EntityDeletedEvent<>(client, auth, IdentityZoneHolder.getCurrentZoneId()); publish(delete); - } catch (NoSuchClientException e) { + } catch (NoSuchClientException _) { logger.debug("Ignoring delete for non existent client:{}", clientId); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java index 38ec74c0a35..ae57f9bd27f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java @@ -197,9 +197,9 @@ public Map getErrorCounts() { public ClientDetails getClientDetails(@PathVariable String client) { try { return removeSecret(clientDetailsService.retrieve(client, identityZoneManager.getCurrentIdentityZoneId())); - } catch (InvalidClientException e) { + } catch (InvalidClientException _) { throw new NoSuchClientException("No such client: " + client); - } catch (BadClientCredentialsException e) { + } catch (BadClientCredentialsException _) { // Defensive check, in case the clientDetailsService starts throwing // these instead throw new NoSuchClientException("No such client: " + client); @@ -427,7 +427,7 @@ public ClientDetailsModification[] changeSecretTx(@RequestBody SecretChangeReque } clientDetails[i] = removeSecret(clientDetails[i]); } - } catch (InvalidClientException e) { + } catch (InvalidClientException _) { throw new NoSuchClientException("No such client: " + clientId); } clientSecretChanges.getAndAdd(change.length); @@ -470,7 +470,7 @@ public SearchResults listClientDetails( if (count > clients.size()) { count = clients.size(); } - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { String msg = "Invalid filter expression: [" + filter + "]"; if (StringUtils.hasText(sortBy)) { msg += " [" + sortBy + "]"; @@ -490,7 +490,7 @@ public SearchResults listClientDetails( try { return SearchResultsFactory.buildSearchResultFrom(result, startIndex, count, clients.size(), attributes, attributeNameMapper, Collections.singletonList(SCIM_CLIENTS_SCHEMA_URI)); - } catch (SpelEvaluationException | SpelParseException e) { + } catch (SpelEvaluationException | SpelParseException _) { throw new UaaException("Invalid attributes: [" + attributesCommaSeparated + "]", HttpStatus.BAD_REQUEST.value()); } @@ -503,7 +503,7 @@ public ActionResult changeSecret(@PathVariable String client_id, @RequestBody Se ClientDetails clientDetails; try { clientDetails = clientDetailsService.retrieve(client_id, identityZoneManager.getCurrentIdentityZoneId()); - } catch (InvalidClientException e) { + } catch (InvalidClientException _) { throw new NoSuchClientException("No such client: " + client_id); } @@ -550,7 +550,7 @@ public ActionResult changeClientJwt(@PathVariable String client_id, @RequestBody UaaClientDetails uaaUaaClientDetails; try { uaaUaaClientDetails = (UaaClientDetails) clientDetailsService.retrieve(client_id, identityZoneManager.getCurrentIdentityZoneId()); - } catch (InvalidClientException e) { + } catch (InvalidClientException _) { throw new NoSuchClientException("No such client: " + client_id); } @@ -636,7 +636,7 @@ public ResponseEntity handleClientAlreadyExists(C private void incrementErrorCounts(Exception e) { String series = UaaStringUtils.getErrorName(e); - errorCounts.computeIfAbsent(series, k -> new AtomicInteger()).incrementAndGet(); + errorCounts.computeIfAbsent(series, _ -> new AtomicInteger()).incrementAndGet(); } @@ -668,13 +668,13 @@ private boolean authenticateClient(String clientId, String clientSecret) { if (curRequest != null) { authentication.setDetails(new UaaAuthenticationDetails(curRequest, clientId)); } - } catch (IllegalStateException x) { - //ignore - means no thread bound request found + } catch (IllegalStateException _) { + //ignore - means no thread-bound request found } try { Authentication auth = authenticationManager.authenticate(authentication); return auth.isAuthenticated(); - } catch (AuthenticationException e) { + } catch (AuthenticationException _) { return false; } catch (Exception e) { logger.debug("Unable to authenticate/validate {}", clientId, e); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidator.java index 502347103bb..27a076cfac8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidator.java @@ -184,7 +184,7 @@ public ClientDetails validate(ClientDetails prototype, boolean create, boolean c ClientDetails caller = null; try { caller = clientDetailsService.retrieve(callerId, identityZoneManager.getCurrentIdentityZoneId()); - } catch (Exception e) { + } catch (Exception _) { // best effort to get the caller, but the caller might not belong to this zone. } if (callerId != null && caller != null) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java index 13e5b98a838..5d8ad74ac78 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAuthenticationFilter.java @@ -86,7 +86,7 @@ public void afterPropertiesSet() { try { oauth2Available = ClassUtils.isPresent(AccessTokenRequiredException.class.getName(), ClassUtils.getDefaultClassLoader()); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError _) { // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java index 0f5921dd9e7..a9284385e1e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientMetadataAdminEndpoints.java @@ -44,7 +44,7 @@ public ClientMetadataAdminEndpoints(final @Qualifier("jdbcClientMetadataProvisio public ClientMetadata retrieveClientMetadata(@PathVariable("client") String clientId) { try { return clientMetadataProvisioning.retrieve(clientId, IdentityZoneHolder.get().getId()); - } catch (EmptyResultDataAccessException erdae) { + } catch (EmptyResultDataAccessException _) { throw new ClientMetadataException("No client metadata found for " + clientId, HttpStatus.NOT_FOUND); } } @@ -72,7 +72,7 @@ public ClientMetadata updateClientMetadata(@RequestBody ClientMetadata clientMet } try { return clientMetadataProvisioning.update(clientMetadata, IdentityZoneHolder.get().getId()); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new ClientMetadataException("No client with ID " + clientMetadata.getClientId(), HttpStatus.NOT_FOUND); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/JdbcClientMetadataProvisioning.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/JdbcClientMetadataProvisioning.java index 9bd3c507f9a..6c6e7d1217e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/JdbcClientMetadataProvisioning.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/JdbcClientMetadataProvisioning.java @@ -114,7 +114,7 @@ public ClientMetadata mapRow(ResultSet rs, int rowNum) throws SQLException { clientMetadata.setShowOnHomePage(rs.getBoolean("show_on_home_page")); try { clientMetadata.setAppLaunchUrl(new URL(rs.getString("app_launch_url"))); - } catch (MalformedURLException mue) { + } catch (MalformedURLException _) { // it is safe to ignore this as client_metadata rows are always created from a ClientMetadata instance whose launch url property is strongly typed to URL } byte[] iconBytes = rs.getBytes("app_icon"); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/client/event/ClientAdminEventPublisher.java b/server/src/main/java/org/cloudfoundry/identity/uaa/client/event/ClientAdminEventPublisher.java index 02dd434e6d0..9e5940781fe 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/client/event/ClientAdminEventPublisher.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/client/event/ClientAdminEventPublisher.java @@ -123,7 +123,7 @@ public void clientJwtChange(String clientId) { private ClientDetails getClient(String clientId) { try { return clientDetailsService.loadClientByClientId(clientId, identityZoneManager.getCurrentIdentityZoneId()); - } catch (InvalidClientException e) { + } catch (InvalidClientException _) { return null; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java index bafa7dbbf16..f9b47ac1524 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/CodeStoreEndpoints.java @@ -35,11 +35,11 @@ public class CodeStoreEndpoints { public ExpiringCode generateCode(@RequestBody ExpiringCode expiringCode) { try { return expiringCodeStore.generateCode(expiringCode.getData(), expiringCode.getExpiresAt(), null, identityZoneManager.getCurrentIdentityZoneId()); - } catch (NullPointerException e) { + } catch (NullPointerException _) { throw new CodeStoreException("data and expiresAt are required.", HttpStatus.BAD_REQUEST); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { throw new CodeStoreException("expiresAt must be in the future.", HttpStatus.BAD_REQUEST); - } catch (DataIntegrityViolationException e) { + } catch (DataIntegrityViolationException _) { throw new CodeStoreException("Duplicate code generated.", HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -50,7 +50,7 @@ public ExpiringCode retrieveCode(@PathVariable String code) { ExpiringCode result; try { result = expiringCodeStore.retrieveCode(code, identityZoneManager.getCurrentIdentityZoneId()); - } catch (NullPointerException e) { + } catch (NullPointerException _) { throw new CodeStoreException("code is required.", HttpStatus.BAD_REQUEST); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/JdbcExpiringCodeStore.java b/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/JdbcExpiringCodeStore.java index 582b93ddd35..75f276c6df8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/JdbcExpiringCodeStore.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/codestore/JdbcExpiringCodeStore.java @@ -126,7 +126,7 @@ public ExpiringCode peekCode(String code, String zoneId) { expiringCode = null; } return expiringCode; - } catch (EmptyResultDataAccessException x) { + } catch (EmptyResultDataAccessException _) { return null; } } @@ -148,7 +148,7 @@ public ExpiringCode retrieveCode(String code, String zoneId) { expiringCode = null; } return expiringCode; - } catch (EmptyResultDataAccessException x) { + } catch (EmptyResultDataAccessException _) { return null; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase.java b/server/src/main/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase.java index 316459a3e27..c307ddff8ac 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase.java @@ -133,7 +133,7 @@ private void addToMap(IdentityZone zone, Map> zones, } } - private final RowMapper mapper = (rs, rowNum) -> { + private final RowMapper mapper = (rs, _) -> { IdentityZone identityZone = new IdentityZone(); identityZone.setId(rs.getString(1).trim()); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/error/UaaException.java b/server/src/main/java/org/cloudfoundry/identity/uaa/error/UaaException.java index d0be7a3ae02..5bc684436a9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/error/UaaException.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/error/UaaException.java @@ -101,7 +101,7 @@ public static UaaException valueOf(Map errorParams) { if (errorParams.containsKey(STATUS_STRING)) { try { status = Integer.valueOf(errorParams.get(STATUS_STRING)); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/CustomPropertyConstructor.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/CustomPropertyConstructor.java index debf643b5c3..3c2f95147d1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/CustomPropertyConstructor.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/CustomPropertyConstructor.java @@ -61,7 +61,7 @@ TypeDescription createTypeDescription(Class clazz) { * @param name the bean property name */ protected final void addPropertyAlias(String alias, Class type, String name) { - Map typeMap = properties.computeIfAbsent(type, k -> new HashMap<>()); + Map typeMap = properties.computeIfAbsent(type, _ -> new HashMap<>()); Property property = propertyUtils.getProperty(type, name); typeMap.put(alias, property); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityProviderBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityProviderBootstrap.java index 3e51c16bbbf..ba664f3f057 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityProviderBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityProviderBootstrap.java @@ -247,7 +247,7 @@ public void afterPropertiesSet() throws Exception { public IdentityProvider getProviderByOriginIgnoreActiveFlag(String origin, String zoneId) { try { return provisioning.retrieveByOriginIgnoreActiveFlag(origin, zoneId); - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { return null; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityZoneConfigurationBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityZoneConfigurationBootstrap.java index 63782a5984c..965d857ee6f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityZoneConfigurationBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/IdentityZoneConfigurationBootstrap.java @@ -68,7 +68,7 @@ public class IdentityZoneConfigurationBootstrap implements InitializingBean { private UserConfig defaultUserConfig; - private IdentityZoneValidator validator = (config, mode) -> config; + private IdentityZoneValidator validator = (config, _) -> config; private Map branding; public IdentityZoneConfigurationBootstrap(IdentityZoneProvisioning provisioning) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java index 7402730adc3..def910ef710 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/UaaConfiguration.java @@ -13,6 +13,13 @@ *******************************************************************************/ package org.cloudfoundry.identity.uaa.impl.config; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Valid; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.cloudfoundry.identity.uaa.impl.config.UaaConfiguration.Jwt.Token.Claims; import org.cloudfoundry.identity.uaa.impl.config.UaaConfiguration.Jwt.Token.Policy; import org.cloudfoundry.identity.uaa.impl.config.UaaConfiguration.Jwt.Token.Policy.KeySpec; @@ -26,15 +33,9 @@ import org.yaml.snakeyaml.constructor.Construct; import org.yaml.snakeyaml.nodes.Node; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Valid; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import java.io.BufferedReader; import java.io.FileReader; +import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; @@ -343,7 +344,7 @@ public Object construct(Node node) { } } - public static void main(String[] args) throws Exception { + void main(String[] args) throws IOException { if (args.length != 1) { throw new IllegalArgumentException("YAML file required"); } @@ -354,7 +355,7 @@ public static void main(String[] args) throws Exception { ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); Validator validator = factory.getValidator(); Set> errors = validator.validate(config); - System.out.println(errors); + IO.println(errors); } } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java index 9ff8e6d4975..c3e097dd9b1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/YamlServletProfileInitializer.java @@ -88,7 +88,7 @@ public void initialize(ConfigurableWebApplicationContext applicationContext) { ServletConfig servletConfig = null; try { servletConfig = applicationContext.getServletConfig(); - } catch (UnsupportedOperationException ignore) { + } catch (UnsupportedOperationException _) { System.err.println("Unable to load Servlet Context - are you testing?"); } WebApplicationContextUtils.initServletPropertySources(applicationContext.getEnvironment().getPropertySources(), @@ -141,7 +141,7 @@ private static List getSecretsFiles( System.out.println(SECRETS_DIR_VAR + " resolves to " + resolvedSecretsLocation); final File[] secretFiles = - ofNullable(new File(resolvedSecretsLocation).listFiles((dir, name) -> name != null && name.endsWith(".yml"))) + ofNullable(new File(resolvedSecretsLocation).listFiles((_, name) -> name != null && name.endsWith(".yml"))) .orElse(new File[]{}); if (secretFiles.length == 0) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/EmailInvitationsService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/EmailInvitationsService.java index 4e37c32ae13..5bd1d26ddf7 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/EmailInvitationsService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/EmailInvitationsService.java @@ -80,7 +80,7 @@ public AcceptedInvitation acceptInvitation(String code, String password) { ClientDetails clientDetails = clientDetailsService.loadClientByClientId(clientId, identityZoneManager.getCurrentIdentityZoneId()); Set redirectUris = clientDetails.getRegisteredRedirectUri(); redirectLocation = UaaUrlUtils.findMatchingRedirectUri(redirectUris, redirectUri, redirectLocation); - } catch (NoSuchClientException x) { + } catch (NoSuchClientException _) { logger.debug("Unable to find client_id for invitation:{}", clientId); } catch (Exception x) { logger.error("Unable to resolve redirect for clientID:{}", clientId, x); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java index 153d45f65cb..ef1e40cb5ba 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java @@ -168,7 +168,7 @@ public String acceptInvitePage(@RequestParam String code, Model model, HttpServl } updateModelWithConsentAttributes(model); return "invitations/accept_invite"; - } catch (EmptyResultDataAccessException noProviderFound) { + } catch (EmptyResultDataAccessException _) { log.debug("No available invitation providers for email:%s, id:%s".formatted(codeData.get(EMAIL), codeData.get("user_id"))); return handleUnprocessableEntity(model, response, "error_message_code", "no_suitable_idp", "invitations/accept_invite"); } @@ -281,7 +281,7 @@ public String acceptInvitation(@RequestParam("password") String password, AcceptedInvitation invitation; try { invitation = invitationsService.acceptInvitation(newCode, password); - } catch (HttpClientErrorException e) { + } catch (HttpClientErrorException _) { return handleUnprocessableEntity(model, response, "error_message_code", "code_expired", "invitations/accept_invite"); } String res = "redirect:/login?success=invite_accepted"; @@ -301,7 +301,7 @@ private String processErrorReload(String code, Model model, HttpServletResponse model.addAttribute(errorCode, error); model.addAttribute("code", newCode); return "redirect:accept"; - } catch (EmptyResultDataAccessException noProviderFound) { + } catch (EmptyResultDataAccessException _) { log.debug("No available invitation providers for email:%s, id:%s".formatted(codeData.get(EMAIL), codeData.get("user_id"))); return handleUnprocessableEntity(model, response, "error_message_code", "no_suitable_idp", "invitations/accept_invite"); } @@ -328,7 +328,7 @@ public String acceptLdapInvitation(@RequestParam("enterprise_username") String u ldapProvider = identityProviderProvisioning.retrieveByOrigin(OriginKeys.LDAP, identityZoneManager.getCurrentIdentityZoneId()); zoneAwareAuthenticationManager.getLdapAuthenticationManager(identityZoneManager.getCurrentIdentityZone(), ldapProvider).getLdapAuthenticationManager(); authenticationManager = zoneAwareAuthenticationManager.getLdapAuthenticationManager(identityZoneManager.getCurrentIdentityZone(), ldapProvider).getLdapManagerActual(); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { //ldap provider was not available return handleUnprocessableEntity(model, response, "error_message_code", "no_suitable_idp", "invitations/accept_invite"); } catch (Exception x) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java index 941058c96b8..d17f1a746cc 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsEndpoint.java @@ -115,7 +115,7 @@ public ResponseEntity inviteUsers(@RequestBody InvitationsR try { URL inviteLink = new URL(invitationLink); invitationsResponse.getNewInvites().add(InvitationsResponse.success(user.getPrimaryEmail(), user.getId(), user.getOrigin(), inviteLink)); - } catch (MalformedURLException mue) { + } catch (MalformedURLException _) { invitationsResponse.getFailedInvites().add(InvitationsResponse.failure(email, "invitation.exception.url", "Malformed url: %s".formatted(invitationLink))); } } else if (providers.isEmpty()) { @@ -127,7 +127,7 @@ public ResponseEntity inviteUsers(@RequestBody InvitationsR invitationsResponse.getFailedInvites().add(InvitationsResponse.failure(email, "email.invalid", email + " is invalid email.")); } - } catch (ScimResourceConflictException x) { + } catch (ScimResourceConflictException _) { invitationsResponse.getFailedInvites().add(InvitationsResponse.failure(email, "user.ambiguous", "Multiple users with the same origin matched to the email address.")); } catch (UaaException uaae) { invitationsResponse.getFailedInvites().add(InvitationsResponse.failure(email, "invitation.exception", uaae.getMessage())); @@ -158,7 +158,7 @@ private boolean validateEmail(String email) { try { InternetAddress emailAddr = new InternetAddress(email); emailAddr.validate(); - } catch (AddressException e) { + } catch (AddressException _) { valid = false; } return valid; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java index 04cc91cceed..ab47cea2eb7 100755 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java @@ -177,7 +177,7 @@ public LoginInfoEndpoint( private static Properties tryLoadAllProperties(final String fileName) { try { return PropertiesLoaderUtils.loadAllProperties(fileName); - } catch (IOException ignored) { + } catch (IOException _) { return new Properties(); } } @@ -188,7 +188,7 @@ private static List getSavedAccounts(Cookie[] .map(c -> { try { return JsonUtils.readValue(decodeCookieValue(c.getValue()), clazz); - } catch (JsonUtilException e) { + } catch (JsonUtilException _) { return null; } }) @@ -311,7 +311,7 @@ private String login(Model model, Principal principal, List excludedProm samlIdentityProviders.put(idp.getOriginKey(), samlConfig); } } - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { // ignore } } @@ -352,7 +352,7 @@ private String login(Model model, Principal principal, List excludedProm ldapIdentityProvider = providerProvisioning.retrieveByOrigin( OriginKeys.LDAP, IdentityZoneHolder.get().getId() ); - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { // ignore } IdentityProvider uaaIdentityProvider = @@ -685,7 +685,7 @@ private IdentityProvider getIdentityProviderByOrigin(List allowedIdps, S if (originKey != null && (allowedIdps == null || allowedIdps.contains(originKey))) { identityProvider = providerProvisioning.retrieveByOrigin(originKey, IdentityZoneHolder.get().getId()); } - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { // ignore } return identityProvider; @@ -721,7 +721,7 @@ private Map getClientInfo(HttpSession session) { try { ClientDetails clientDetails = clientDetailsService.loadClientByClientId(clientIds[0], IdentityZoneHolder.get().getId()); return clientDetails.getAdditionalInformation(); - } catch (NoSuchClientException x) { + } catch (NoSuchClientException _) { return null; } } @@ -780,7 +780,7 @@ private void populatePrompts( IdentityProvider providerForOrigin = null; try { providerForOrigin = providerProvisioning.retrieveByOrigin(origin, IdentityZoneHolder.get().getId()); - } catch (DataAccessException ignored) { + } catch (DataAccessException _) { // ignore } if (providerForOrigin != null && providerForOrigin.getConfig() instanceof OIDCIdentityProviderDefinition oidcConfig) { @@ -838,7 +838,7 @@ public String discoverIdentityProvider(@RequestParam String email, @RequestParam String[] clientIds = savedRequest.getParameterValues(CLIENT_ID_PARAMETER); try { clientDetails = clientDetailsService.loadClientByClientId(clientIds[0], IdentityZoneHolder.get().getId()); - } catch (NoSuchClientException ignored) { + } catch (NoSuchClientException _) { // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java b/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java index 0cef4203f29..13e9c84750a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/message/util/FakeJavaMailSender.java @@ -147,7 +147,7 @@ public String toString() { sb.append("From=").append(Arrays.toString(getFrom().toArray())); sb.append("; To=").append(Arrays.toString(getRecipients(Message.RecipientType.TO).toArray())); sb.append("; Content=").append(getContentString()); - } catch (MessagingException | IOException x) { + } catch (MessagingException | IOException _) { sb.append("Message=").append(mimeMessage); } sb.append('}'); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java index 7b5943625a4..ead54a4c11e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/IntrospectEndpoint.java @@ -42,7 +42,7 @@ public IntrospectionClaims introspect(@RequestParam String token) { resourceServerTokenServices.loadAuthentication(token); introspectionClaims = UaaTokenUtils.getClaims(oAuth2AccessToken.getValue(), IntrospectionClaims.class); introspectionClaims.setActive(true); - } catch (InvalidTokenException e) { + } catch (InvalidTokenException _) { introspectionClaims.setActive(false); return introspectionClaims; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/KeyInfo.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/KeyInfo.java index a371dcdf0d3..2255cfe6ea8 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/KeyInfo.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/KeyInfo.java @@ -186,7 +186,7 @@ private Optional getValidX509Certificate(String pemEncoded) { x509Certificate.checkValidity(); return Optional.of(x509Certificate); } - } catch (RuntimeException | CertificateExpiredException | CertificateNotYetValidException e) { + } catch (RuntimeException | CertificateExpiredException | CertificateNotYetValidException _) { // ignore } return Optional.empty(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenValidationService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenValidationService.java index d4b98528924..2f068efe943 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenValidationService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/TokenValidationService.java @@ -42,7 +42,7 @@ public JwtTokenSignedByThisUAA validateToken(String token, boolean isAccessToken RevocableToken revocableToken; try { revocableToken = revocableTokenProvisioning.retrieve(token, IdentityZoneHolder.get().getId()); - } catch (EmptyResultDataAccessException ex) { + } catch (EmptyResultDataAccessException _) { throw new TokenRevokedException("The token expired, was revoked, or the token ID is incorrect."); } token = revocableToken.getValue(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java index 9ac74102177..5630eb5041a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationEndpoint.java @@ -173,7 +173,7 @@ public ModelAndView authorize(Map model, AuthorizationRequest authorizationRequest; try { authorizationRequest = getOAuth2RequestFactory().createAuthorizationRequest(parameters); - } catch (DisallowedIdpException x) { + } catch (DisallowedIdpException _) { return switchIdp(model, client, clientId, request); } @@ -195,7 +195,7 @@ public ModelAndView authorize(Map model, String redirectUriParameter = authorizationRequest.getRequestParameters().get(OAuth2Utils.REDIRECT_URI); try { resolvedRedirect = redirectResolver.resolveRedirect(redirectUriParameter, client); - } catch (RedirectMismatchException rme) { + } catch (RedirectMismatchException _) { throw new RedirectMismatchException( "Invalid redirect " + redirectUriParameter + " did not match one of the registered values"); } @@ -331,7 +331,7 @@ public void commence(HttpServletRequest request, HttpServletResponse response, A String resolvedRedirect; try { resolvedRedirect = redirectResolver.resolveRedirect(redirectUri, client); - } catch (RedirectMismatchException rme) { + } catch (RedirectMismatchException _) { logger.debug("[prompt=none] Invalid redirect " + redirectUri + " did not match one of the registered values"); response.setStatus(HttpStatus.BAD_REQUEST.value()); return; @@ -804,7 +804,7 @@ private ModelAndView handleException(Exception e, ServletWebRequest webRequest) String redirect = getUnsuccessfulRedirect(authorizationRequest, translate.getBody(), authorizationRequest .getResponseTypes().contains("token")); return new ModelAndView(new RedirectView(redirect, false, true, false)); - } catch (OAuth2Exception ex) { + } catch (OAuth2Exception _) { // If an AuthorizationRequest cannot be created from the incoming parameters it must be // an error. OAuth2Exception can be handled this way. Other exceptions will generate a standard 500 // response. @@ -832,10 +832,9 @@ private AuthorizationRequest getAuthorizationRequestForError(ServletWebRequest w try { return getOAuth2RequestFactory().createAuthorizationRequest(parameters); - } catch (Exception e) { + } catch (Exception _) { return getDefaultOAuth2RequestFactory().createAuthorizationRequest(parameters); } - } private ClientDetails loadClientByClientId(String clientId) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationRequestManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationRequestManager.java index ecac542b4ce..936a1d8a73a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationRequestManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaAuthorizationRequestManager.java @@ -210,7 +210,7 @@ protected void checkClientIdpAuthorization(UaaClientDetails client, UaaUser user if (provider == null || !allowedProviders.contains(provider.getOriginKey())) { throw new DisallowedIdpException("Client is not authorized for specified user's identity provider."); } - } catch (EmptyResultDataAccessException x) { + } catch (EmptyResultDataAccessException _) { //this should not happen...but if it does throw new UnauthorizedClientException("User does not belong to a valid identity provider."); } @@ -317,7 +317,7 @@ public TokenRequest createTokenRequest(Map requestParameters, Cl if (hasText(audience)) { try { targetClient = clientDetailsService.loadClientByClientId(audience, identityZoneManager.getCurrentIdentityZoneId()); - } catch (ClientRegistrationException r) { + } catch (ClientRegistrationException _) { throw new InvalidClientException("Invalid audience("+audience+") for "+ GRANT_TYPE_TOKEN_EXCHANGE+ " grant."); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServices.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServices.java index 97d89843d2c..8594557377d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServices.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServices.java @@ -477,7 +477,7 @@ private CompositeToken createCompositeToken(String tokenId, IdToken idTokenContent; try { idTokenContent = idTokenCreator.create(clientDetails, user, userAuthenticationData, tokenActor); - } catch (RuntimeException | IdTokenCreationException ignored) { + } catch (RuntimeException | IdTokenCreationException _) { throw new IllegalStateException("Cannot convert id token to JSON"); } String encodedIdTokenContent = JwtHelper.encode(idTokenContent.getClaimMap(), keyInfoService.getActiveKey()).getEncoded(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java index 19fb952e658..fb83345f099 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java @@ -154,7 +154,8 @@ public OAuth2Authentication consumeAuthorizationCode(String code) throws Invalid template.update(SQL_DELETE_STATEMENT, code); } } - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { + // ignore } throw new InvalidGrantException("Invalid authorization code: " + code); } @@ -246,7 +247,7 @@ private void actuallyPerformExpirationClean(Instant now) { logger.debug("[oauth_code] Removed {} expired entries.", expired); expired = template.update(SQL_CLEAN_STATEMENT, Timestamp.from(now.minus(LEGACY_CODE_EXPIRATION_TIME))); logger.debug("[oauth_code] Removed {} old entries.", expired); - } catch (DeadlockLoserDataAccessException e) { + } catch (DeadlockLoserDataAccessException _) { logger.debug("[oauth code] Deadlock trying to expire entries, ignored."); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/LegacyRedirectResolver.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/LegacyRedirectResolver.java index d8b639b6b03..27d1c56c886 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/LegacyRedirectResolver.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/LegacyRedirectResolver.java @@ -131,7 +131,7 @@ private static String normalizeWildcardUri(String uriClient) { if (hasWildcarPort) { uriComponentsBuilder.port(99999); } - } catch (NullPointerException e) { + } catch (NullPointerException _) { throw new IllegalArgumentException("URI host and scheme must not be null"); } @@ -150,7 +150,7 @@ private static void redactQueryParams(UriComponentsBuilder builder) { MultiValueMap originalParams = builder.build().getQueryParams(); Map> redactedParams = originalParams.entrySet() .stream() - .map(e -> new SimpleEntry<>(e.getKey(), e.getValue().stream().map(v -> "REDACTED").toList())) + .map(e -> new SimpleEntry<>(e.getKey(), e.getValue().stream().map(_ -> "REDACTED").toList())) .collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); builder.replaceQueryParams(new LinkedMultiValueMap<>(redactedParams)); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolver.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolver.java index 1f9f2b29802..5ed9dd66a7f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolver.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/beans/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolver.java @@ -129,7 +129,8 @@ protected boolean redirectMatches(String requestedRedirect, String redirectUri) return StringUtils.cleanPath(req.getPath()).startsWith(StringUtils.cleanPath(reg.getPath())); } } - catch (MalformedURLException ignored) { + catch (MalformedURLException _) { + // ignore } return requestedRedirect.equals(redirectUri); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtClientAuthentication.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtClientAuthentication.java index 399d93870f0..75c3eda0f18 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtClientAuthentication.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtClientAuthentication.java @@ -225,7 +225,7 @@ private boolean validateFederatedClientJWT(JWT jwtAssertion, JWTClaimsSet client JWKSet jwkSet = retrieveJwkSet(clientClaims); String expectedAud = Optional.ofNullable(jwtFederation.getAudience()).orElse(keyInfoService.getTokenEndpointUrl()); return validateClientJWToken(jwtAssertion, jwkSet, JWT_RFC7523_CLAIMS, jwtFederation.getSubject(), jwtFederation.getIssuer(), expectedAud) != null; - } catch (MalformedURLException | IllegalArgumentException | URISyntaxException e) { + } catch (MalformedURLException | IllegalArgumentException | URISyntaxException _) { return false; } } @@ -246,7 +246,7 @@ private JWKSet getTrustedJwksSet(String issuer) throws OidcMetadataFetchingExcep if (idp.getConfig() instanceof OIDCIdentityProviderDefinition oidcDefinition) { def = oidcDefinition; } - } catch (DataRetrievalFailureException dataRetrievalFailureException) { + } catch (DataRetrievalFailureException _) { // ignore, but retrieve trust by OIDC compliant issuer } if (def == null) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtHelper.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtHelper.java index 0c2c91d3765..77e9ccafea0 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtHelper.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtHelper.java @@ -262,7 +262,7 @@ private JWTClaimsSet validateClientJWToken(JWT jwtAssertion, JWKSet jwkSet) { return jwtProcessor.process(jwtAssertion, null); } catch (BadJWSException | BadJWTException jwtException) { // signature failed throw new InvalidSignatureException("Unauthorized token", jwtException); - } catch (KeyLengthException ke) { + } catch (KeyLengthException _) { return UaaMacSigner.verify(jwtAssertion.getParsedString(), jwkSet); } catch (BadJOSEException | JOSEException e) { // key resolution, structure of JWT failed throw new InvalidSignatureException("Untrusted token", e); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/SignatureVerifier.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/SignatureVerifier.java index 1087f2e4e76..ab04fc0216a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/SignatureVerifier.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/SignatureVerifier.java @@ -90,7 +90,7 @@ public JWKSet getJwkSet(String keyId) { Map keyMap = new HashMap<>(delegate.getKeyProperties()); keyMap.put(HeaderParameterNames.KEY_ID, keyId); return new JWKSet(JWK.parse(keyMap)); - } catch (ParseException e) { + } catch (ParseException _) { // ignore } return new JWKSet(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/openid/IdTokenGranter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/openid/IdTokenGranter.java index 42d3dfc349c..fd8d310bfdb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/openid/IdTokenGranter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/openid/IdTokenGranter.java @@ -52,7 +52,7 @@ public boolean shouldSendIdToken(UaaUser user, approvalService.ensureRequiredApprovals( user.getId(), Sets.newHashSet(REQUIRED_OPENID_SCOPE), requestedGrantType, clientDetails ); - } catch (InvalidTokenException e) { + } catch (InvalidTokenException _) { return false; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationManager.java index 45e0951d3d4..72324584d55 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/authentication/OAuth2AuthenticationManager.java @@ -94,7 +94,7 @@ private void checkClientDetails(OAuth2Authentication auth) { try { client = clientDetailsService.loadClientByClientId(auth.getOAuth2Request().getClientId()); } - catch (ClientRegistrationException e) { + catch (ClientRegistrationException _) { throw new OAuth2AccessDeniedException("Invalid token contains invalid client id"); } Set allowed = client.getScope(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java index 27a7a0f9e44..d5edcb7ba1c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilter.java @@ -129,7 +129,7 @@ protected String calculateCurrentUri(HttpServletRequest request) { UriComponents uri = null; try { uri = builder.replaceQueryParam("code").build(true); - } catch (IllegalArgumentException ex) { + } catch (IllegalArgumentException _) { // ignore failures to parse the url (including query string). does't // make sense for redirection purposes anyway. return null; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/code/JdbcAuthorizationCodeServices.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/code/JdbcAuthorizationCodeServices.java index 5e226422358..8ecc78acee9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/code/JdbcAuthorizationCodeServices.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/code/JdbcAuthorizationCodeServices.java @@ -56,7 +56,7 @@ public OAuth2Authentication mapRow(ResultSet rs, int rowNum) return SerializationUtils.deserialize(rs.getBytes("authentication")); } }, code); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/password/ResourceOwnerPasswordTokenGranter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/password/ResourceOwnerPasswordTokenGranter.java index be93a629df1..ada20446ada 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/password/ResourceOwnerPasswordTokenGranter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/password/ResourceOwnerPasswordTokenGranter.java @@ -68,7 +68,7 @@ protected OAuth2Authentication getOAuth2Authentication(ClientDetails client, Tok // If the username/password are wrong the spec says we should send 400/invalid grant throw new InvalidGrantException(e.getMessage()); } - catch (UsernameNotFoundException e) { + catch (UsernameNotFoundException _) { // If the user is not found, report a generic error message throw new InvalidGrantException("username not found"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/refresh/RefreshTokenGranter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/refresh/RefreshTokenGranter.java index f323593a1f3..8f5cfcb1502 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/refresh/RefreshTokenGranter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/provider/refresh/RefreshTokenGranter.java @@ -41,7 +41,7 @@ protected OAuth2AccessToken getAccessToken(ClientDetails client, TokenRequest to catch (AccountStatusException ase) { //covers expired, locked, disabled cases (mentioned in section 5.2, draft 31) throw new InvalidGrantException(ase.getMessage()); - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { // If the user is not found, report a generic error message throw new InvalidGrantException("user not found"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/TokenExchangeGranter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/TokenExchangeGranter.java index 38fd303545b..738d73fce76 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/TokenExchangeGranter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/TokenExchangeGranter.java @@ -76,18 +76,18 @@ protected Authentication validateRequest(TokenRequest request) { if (!client.getAuthorizedGrantTypes().contains(GRANT_TYPE_TOKEN_EXCHANGE)) { throw new InvalidGrantException("Unsupported grant type"); } - } catch (ClientRegistrationException e) { + } catch (ClientRegistrationException _) { throw new InvalidGrantException("Invalid client_id"); } String audience = request.getRequestParameters().get("audience"); if (hasText(audience)) { try { clientDetailsService.loadClientByClientId(audience); - } catch (ClientRegistrationException e) { + } catch (ClientRegistrationException _) { throw new InvalidGrantException("Invalid audience"); } String requiredImpersonationAuthority = - String.format(TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION, audience); + TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION.formatted(audience); long count = client.getAuthorities()==null ? 0l : client .getAuthorities() .stream() diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java index 40da5581fd1..e870a372f02 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java @@ -79,7 +79,7 @@ protected Optional> retrieveEntity(final String id, final St final IdentityProvider identityProvider; try { identityProvider = identityProviderProvisioning.retrieve(id, zoneId); - } catch (final EmptyResultDataAccessException e) { + } catch (final EmptyResultDataAccessException _) { LOGGER.warn("The IdP with ID '{}' does not exist in the zone '{}'.", id, zoneId); return Optional.empty(); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java index b34e1f01c2d..71d688efc21 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java @@ -232,11 +232,11 @@ private ResponseEntity persistIdentityProviderChange(IdentityP IdentityProvider existing, HttpStatus status) { final IdentityProvider updatedIdp; try { - updatedIdp = transactionTemplate.execute(txStatus -> { + updatedIdp = transactionTemplate.execute(_ -> { final IdentityProvider updatedOriginalIdp = status == CREATED ? identityProviderProvisioning.create(body, zoneId) : identityProviderProvisioning.update(body, zoneId); return idpAliasHandler.ensureConsistencyOfAliasEntity(updatedOriginalIdp, existing); }); - } catch (final IdpAlreadyExistsException e) { + } catch (final IdpAlreadyExistsException _) { return new ResponseEntity<>(body, CONFLICT); } catch (final EntityAliasFailedException e) { logger.warn("Could not create alias for %s".formatted(e.getMessage())); @@ -337,7 +337,7 @@ public ResponseEntity testIdentityProvider(@RequestBody IdentityProvider if ((result == null) || (!result.isAuthenticated())) { status = EXPECTATION_FAILED; } - } catch (BadCredentialsException x) { + } catch (BadCredentialsException _) { status = EXPECTATION_FAILED; exception = "bad credentials"; } catch (InternalAuthenticationServiceException x) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/JdbcIdentityProviderProvisioning.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/JdbcIdentityProviderProvisioning.java index 7eb8d22b34b..a3068b769a7 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/JdbcIdentityProviderProvisioning.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/JdbcIdentityProviderProvisioning.java @@ -99,7 +99,7 @@ public List retrieveActiveByTypes(final String zoneId, final S final Set typesAsSet = new HashSet<>(Arrays.asList(types)); // adjust the number of SQL parameters in the prepared statement - final String sqlPlaceholdersForTypes = typesAsSet.stream().map(type -> "?").collect(joining(",")); + final String sqlPlaceholdersForTypes = typesAsSet.stream().map(_ -> "?").collect(joining(",")); final String sql = IDENTITY_ACTIVE_PROVIDERS_OF_TYPE_QUERY_TEMPLATE.formatted(sqlPlaceholdersForTypes); final ArrayList arrayList = new ArrayList<>(typesAsSet.size() + 2); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparator.java index 80b9ac128ee..ebc141bdf2e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparator.java @@ -36,9 +36,9 @@ public boolean matches(CharSequence rawPassword, String encodedPassword) { throw new UnsupportedOperationException(); } - public static void main(String[] args) { + void main() { LdapSecurityConstants test = PasswordUtil.findAlgorithm("{sha}YaE1CJ6sVhov987e77A5db7QAPg=".getBytes()); - System.out.println(test); + IO.println(test); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ExtendedLdapUserMapper.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ExtendedLdapUserMapper.java index ad43e65d020..d6eda9ace10 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ExtendedLdapUserMapper.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/ExtendedLdapUserMapper.java @@ -71,7 +71,7 @@ public UserDetails mapUserFromContext(DirContextOperations ctx, String username, } else { record.put(attributeName, values); } - } catch (ArrayStoreException x) { + } catch (ArrayStoreException _) { logger.debug("Attribute value is not a string for '{}'", attributeName); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/PasswordComparisonAuthenticator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/PasswordComparisonAuthenticator.java index a4aceec575c..c16844f4403 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/PasswordComparisonAuthenticator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/PasswordComparisonAuthenticator.java @@ -69,7 +69,7 @@ public DirContextOperations authenticate(Authentication authentication) { for (String userDn : getUserDns(username)) { try { user = ldapTemplate.retrieveEntry(userDn, getUserAttributes()); - } catch (NameNotFoundException ignore) { + } catch (NameNotFoundException _) { // ignore } if (user != null) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/extension/SpringSecurityLdapTemplate.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/extension/SpringSecurityLdapTemplate.java index 1141c83c21e..fadd96f3458 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/extension/SpringSecurityLdapTemplate.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/ldap/extension/SpringSecurityLdapTemplate.java @@ -260,7 +260,7 @@ public static DirContextOperations searchForSingleEntryInternal(DirContext ctx, } results.add(dca); } - } catch (PartialResultException e) { + } catch (PartialResultException _) { LdapUtils.closeEnumeration(resultsEnum); logger.info("Ignoring PartialResultException"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationManager.java index c0933008e5b..3de05debbc9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationManager.java @@ -188,7 +188,7 @@ public IdentityProvider resolveOriginProvider(String idToken) throws Authenticat // 1. Check if there is an IdP with the 'iss' claim value equal to the 'issuer' field in its configuration try { return retrieveRegisteredIdentityProviderByIssuer(issuer); - } catch (IncorrectResultSizeDataAccessException x) { + } catch (IncorrectResultSizeDataAccessException _) { logger.debug("No registered identity provider found for given issuer. Checking for uaa."); } @@ -203,7 +203,7 @@ public IdentityProvider resolveOriginProvider(String idToken) throws Authenticat } //All other cases: throw Exception throw new InsufficientAuthenticationException("Unable to map issuer, %s , to a single registered provider".formatted(issuer)); - } catch (IllegalArgumentException | JsonUtils.JsonUtilException x) { + } catch (IllegalArgumentException | JsonUtils.JsonUtilException _) { throw new InsufficientAuthenticationException("Unable to decode expected id_token"); } } @@ -248,7 +248,7 @@ protected AuthenticationData getExternalAuthenticationDetails(final Authenticati if (provider == null) { try { provider = getProviderProvisioning().retrieveByOrigin(origin, identityZoneManager.getCurrentIdentityZoneId()); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { logger.info("No provider found for given origin"); throw new InsufficientAuthenticationException("Could not resolve identity provider with given origin."); } @@ -568,7 +568,7 @@ private boolean isRegisteredIdpAuthentication(Authentication request) { // check if the UAA Identity Zone is registered as an external Idp of itself retrieveRegisteredIdentityProviderByIssuer(issuer); return true; - } catch (IncorrectResultSizeDataAccessException e) { + } catch (IncorrectResultSizeDataAccessException _) { return false; } } else { @@ -908,7 +908,7 @@ && providerSupportsTokenExchange(retrievedByOrigin) && (allowedProviders == null || allowedProviders.contains(useOrigin))) { return (IdentityProvider) retrievedByOrigin; } - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/OauthIDPWrapperFactoryBean.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/OauthIDPWrapperFactoryBean.java index a672df013b4..5e2575289ae 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/OauthIDPWrapperFactoryBean.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/oauth/OauthIDPWrapperFactoryBean.java @@ -128,7 +128,7 @@ public static IdentityProviderWrapper getIdentityProviderWrapper(String origin, provider.setActive(true); try { provider.setConfig(rawDef); - } catch (JsonUtils.JsonUtilException x) { + } catch (JsonUtils.JsonUtilException _) { throw new RuntimeException("Non serializable Oauth config"); } IdentityProviderWrapper wrapper = new IdentityProviderWrapper(provider); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/BootstrapSamlIdentityProviderData.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/BootstrapSamlIdentityProviderData.java index dec15bf8b8d..e62c8e51b98 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/BootstrapSamlIdentityProviderData.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/BootstrapSamlIdentityProviderData.java @@ -67,7 +67,7 @@ public static IdentityProvider parseSamlProvider provider.setActive(true); try { provider.setConfig(def); - } catch (JsonUtils.JsonUtilException x) { + } catch (JsonUtils.JsonUtilException _) { throw new RuntimeException("Non serializable SAML config"); } return provider; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProvider.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProvider.java index b59b7e4da1b..c5f7abd092a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProvider.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProvider.java @@ -294,7 +294,7 @@ public static Converter createDefa public static Converter createDefaultAssertionValidatorWithParameters( Consumer> validationContextParameters, boolean saml2bearer) { return createAssertionValidator(Saml2ErrorCodes.INVALID_ASSERTION, - assertionToken -> SAML20AssertionValidators.attributeValidator, + _ -> SAML20AssertionValidators.attributeValidator, assertionToken -> createValidationContext(assertionToken, validationContextParameters, saml2bearer)); } @@ -471,7 +471,7 @@ public static Converter createDefa RelyingPartyRegistration registration = assertionToken.getToken().getRelyingPartyRegistration(); SignatureTrustEngine engine = OpenSamlVerificationUtils.trustEngine(registration); return SAML20AssertionValidators.createSignatureValidator(engine); - }, assertionToken -> new ValidationContext( + }, _ -> new ValidationContext( Collections.singletonMap(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, false))); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSamlVerificationUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSamlVerificationUtils.java index 2284afb6045..831e0a25177 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSamlVerificationUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSamlVerificationUtils.java @@ -103,7 +103,7 @@ Saml2ResponseValidatorResult post(Signature signature) { SAMLSignatureProfileValidator profileValidator = new SAMLSignatureProfileValidator(); try { profileValidator.validate(signature); - } catch (Exception ex) { + } catch (Exception _) { errors.add(new Saml2Error(Saml2ErrorCodes.INVALID_SIGNATURE, INVALID_SIGNATURE_FOR_OBJECT_COLON.formatted(this.id))); } @@ -113,7 +113,7 @@ Saml2ResponseValidatorResult post(Signature signature) { errors.add(new Saml2Error(Saml2ErrorCodes.INVALID_SIGNATURE, INVALID_SIGNATURE_FOR_OBJECT.formatted(this.id))); } - } catch (Exception ex) { + } catch (Exception _) { errors.add(new Saml2Error(Saml2ErrorCodes.INVALID_SIGNATURE, INVALID_SIGNATURE_FOR_OBJECT_COLON.formatted(this.id))); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/RelyingPartyRegistrationBuilder.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/RelyingPartyRegistrationBuilder.java index be03059b82e..d6bdb5cdc21 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/RelyingPartyRegistrationBuilder.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/RelyingPartyRegistrationBuilder.java @@ -107,7 +107,7 @@ public static String createOwnMetadata(String entityId, List keyWit String certificate = keyWithCerts.stream().findFirst().map(e -> { try { return e.getEncodedCertificate(); - } catch (CertificateException ex) { + } catch (CertificateException _) { return UaaStringUtils.EMPTY_STRING; } }).orElse(UaaStringUtils.EMPTY_STRING); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java index d6db5c569d4..59461ea5250 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfigurator.java @@ -44,7 +44,7 @@ public List getIdentityProviderDefinitions() { public AbstractIdentityProviderDefinition getIdentityProviderDefinitionsForOrigin(IdentityZone zone, String origin) { try { return providerProvisioning.retrieveByOrigin(origin, zone.getId()).getConfig(); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { return null; } } @@ -52,7 +52,7 @@ public AbstractIdentityProviderDefinition getIdentityProviderDefinitionsForOrigi public AbstractIdentityProviderDefinition getIdentityProviderDefinitionsForIssuer(IdentityZone zone, String issuer) { try { return providerProvisioning.retrieveByExternId(issuer, OriginKeys.SAML, zone.getId()).getConfig(); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { return null; } } @@ -116,7 +116,7 @@ public synchronized String validateSamlIdentityProviderDefinition(SamlIdentityPr private boolean entityIdExists(String entityId, String zoneId) { try { return providerProvisioning.retrieveByExternId(entityId, OriginKeys.SAML, zoneId) != null; - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { return false; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlKeyManagerFactory.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlKeyManagerFactory.java index 857c80349a6..c79e7e9f093 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlKeyManagerFactory.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlKeyManagerFactory.java @@ -57,7 +57,7 @@ protected List convertList(List samlKeys) { for (SamlKey k : samlKeys) { try { result.add(convertKey(k)); - } catch (CertificateRuntimeException e) { + } catch (CertificateRuntimeException _) { // already logged in convertKey } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRedirectUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRedirectUtils.java index ef3fba06d47..2b5e89d358f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRedirectUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRedirectUtils.java @@ -39,7 +39,7 @@ public static String getZonifiedEntityId(String entityID, IdentityZone identityZ return url; } } - } catch (Exception ignored) { + } catch (Exception _) { // ignore } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlUaaAuthenticationUserManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlUaaAuthenticationUserManager.java index 943163a3432..88bbfe85d86 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlUaaAuthenticationUserManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlUaaAuthenticationUserManager.java @@ -211,7 +211,7 @@ protected UaaAuthentication getUaaAuthentication(String subjectName, Saml2Authen samlConfig = (SamlIdentityProviderDefinition) idpConfig.getConfig(); idp = (IdentityProvider) idpConfig; addNew = samlConfig.isAddShadowUserOnLogin(); - } catch (EmptyResultDataAccessException x) { + } catch (EmptyResultDataAccessException _) { throw new ProviderNotFoundException("No SAML identity provider found in zone for alias:" + alias); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java index 0d8c2757b72..5002b17818e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterFactoriesSupplier.java @@ -45,7 +45,7 @@ default int getLimiterMappings() { return 0; } - InternalLimiterFactoriesSupplier NOOP = info -> null; + InternalLimiterFactoriesSupplier NOOP = _ -> null; static InternalLimiterFactoriesSupplier deNull(InternalLimiterFactoriesSupplier supplier) { return supplier != null ? supplier : NOOP; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBuckets.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBuckets.java index c9ea25f8291..097f58009c7 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBuckets.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBuckets.java @@ -68,11 +68,9 @@ public void run() { try { TimeUnit.NANOSECONDS.sleep(EXPIRATION_WAIT); processExpirations(); - } - catch (InterruptedException e) { //NOSONAR + } catch (InterruptedException _) { //NOSONAR // As it is a Daemon, ignore InterruptedException - } - catch (RuntimeException e) { + } catch (RuntimeException e) { log.error(e.getMessage(), e); // Log everything else } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/IntUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/IntUtils.java index 6080a3a23f7..88769d21110 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/IntUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/IntUtils.java @@ -11,7 +11,7 @@ public static Integer parseNoException(String source, Integer defaultOnEmpty) { try { return parse(source, defaultOnEmpty); } - catch (NumberFormatException e) { + catch (NumberFormatException _) { return defaultOnEmpty; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/SourcedFile.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/SourcedFile.java index 7363d3f44e9..7427256f4c9 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/SourcedFile.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/SourcedFile.java @@ -68,8 +68,8 @@ private static InputStream getFileInputStream(String dir, String name) { if (file.isFile()) { return new FileInputStream( file ); } - } catch (IOException ignore) { - // ignore! + } catch (IOException _) { + // ignore } return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/StringUtilities.java b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/StringUtilities.java index 395708ad158..92305d74946 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/StringUtilities.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/util/StringUtilities.java @@ -24,14 +24,11 @@ public static String options(String labelSingularButPluralWithAnS, Object[] vali } public static String options(String labelSingular, String labelPlural, Object[] validOptions) { - switch (count(validOptions)) { - case 0: - return "no " + labelPlural; - case 1: - return "the " + labelSingular + " is: " + options(validOptions); - default: - return "the " + labelPlural + " are: " + options(validOptions); - } + return switch (count(validOptions)) { + case 0 -> "no " + labelPlural; + case 1 -> "the " + labelSingular + " is: " + options(validOptions); + default -> "the " + labelPlural + " are: " + options(validOptions); + }; } public static String options(Object[] validOptions) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/resources/SearchResultsFactory.java b/server/src/main/java/org/cloudfoundry/identity/uaa/resources/SearchResultsFactory.java index 7a4403a163d..6dee040366f 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/resources/SearchResultsFactory.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/resources/SearchResultsFactory.java @@ -108,7 +108,7 @@ public static SearchResults> buildSearchResultFrom( try { Object value = attribute.getValue().read(serializedObject); map.put(attribute.getKey(), value); - } catch (PathNotFoundException e) { + } catch (PathNotFoundException _) { map.put(attribute.getKey(), null); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/JdbcPagingList.java b/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/JdbcPagingList.java index ec16ee78e33..271c4082b32 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/JdbcPagingList.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/JdbcPagingList.java @@ -185,7 +185,7 @@ public boolean hasNext() { next = iterator.next(); hasNext = true; return true; - } catch (NoSuchElementException e) { + } catch (NoSuchElementException _) { hasNext = false; return false; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/SimpleSearchQueryConverter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/SimpleSearchQueryConverter.java index dd9e36c63e0..2867b0532b4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/SimpleSearchQueryConverter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/SimpleSearchQueryConverter.java @@ -248,29 +248,18 @@ private void extractValues(SCIMFilter filter, MultiValueMap valu } private String whereClauseFromFilter(SCIMFilter filter, Map values, AttributeNameMapper mapper, String paramPrefix) { - switch (filter.getFilterType()) { - case AND: - return "(" + whereClauseFromFilter(filter.getFilterComponents().getFirst(), values, mapper, paramPrefix) + " AND " + whereClauseFromFilter(filter.getFilterComponents().get(1), values, mapper, paramPrefix) + ")"; - case OR: - return "(" + whereClauseFromFilter(filter.getFilterComponents().getFirst(), values, mapper, paramPrefix) + " OR " + whereClauseFromFilter(filter.getFilterComponents().get(1), values, mapper, paramPrefix) + ")"; - case EQUALITY: - return comparisonClause(filter, "=", values, "", "", paramPrefix); - case CONTAINS: - return comparisonClause(filter, "LIKE", values, "%", "%", paramPrefix); - case STARTS_WITH: - return comparisonClause(filter, "LIKE", values, "", "%", paramPrefix); - case PRESENCE: - return getAttributeName(filter, mapper) + " IS NOT NULL"; - case GREATER_THAN: - return comparisonClause(filter, ">", values, "", "", paramPrefix); - case GREATER_OR_EQUAL: - return comparisonClause(filter, ">=", values, "", "", paramPrefix); - case LESS_THAN: - return comparisonClause(filter, "<", values, "", "", paramPrefix); - case LESS_OR_EQUAL: - return comparisonClause(filter, "<=", values, "", "", paramPrefix); - } - return null; + return switch (filter.getFilterType()) { + case AND -> "(" + whereClauseFromFilter(filter.getFilterComponents().getFirst(), values, mapper, paramPrefix) + " AND " + whereClauseFromFilter(filter.getFilterComponents().get(1), values, mapper, paramPrefix) + ")"; + case OR -> "(" + whereClauseFromFilter(filter.getFilterComponents().getFirst(), values, mapper, paramPrefix) + " OR " + whereClauseFromFilter(filter.getFilterComponents().get(1), values, mapper, paramPrefix) + ")"; + case EQUALITY -> comparisonClause(filter, "=", values, "", "", paramPrefix); + case CONTAINS -> comparisonClause(filter, "LIKE", values, "%", "%", paramPrefix); + case STARTS_WITH -> comparisonClause(filter, "LIKE", values, "", "%", paramPrefix); + case PRESENCE -> getAttributeName(filter, mapper) + " IS NOT NULL"; + case GREATER_THAN -> comparisonClause(filter, ">", values, "", "", paramPrefix); + case GREATER_OR_EQUAL -> comparisonClause(filter, ">=", values, "", "", paramPrefix); + case LESS_THAN -> comparisonClause(filter, "<", values, "", "", paramPrefix); + case LESS_OR_EQUAL -> comparisonClause(filter, "<=", values, "", "", paramPrefix); + }; } private String comparisonClause(SCIMFilter filter, @@ -309,7 +298,7 @@ private String comparisonClause(SCIMFilter filter, } else { try { values.put(pName, Double.parseDouble(filter.getFilterValue())); - } catch (NumberFormatException x) { + } catch (NumberFormatException _) { if ("true".equalsIgnoreCase(filter.getFilterValue())) { values.put(pName, Boolean.TRUE); } else if ("false".equalsIgnoreCase(filter.getFilterValue())) { @@ -341,7 +330,7 @@ private Object getStringOrDate(String s) { try { DateFormat timestampFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); return timestampFormat.parse(s); - } catch (ParseException x) { + } catch (ParseException _) { return s; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java index 9e6222e2593..70fc07c3657 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java @@ -70,7 +70,7 @@ private Optional> retrieveIdpByOrigin(final String originKey final IdentityProvider idpInAliasZone; try { idpInAliasZone = identityProviderProvisioning.retrieveByOrigin(originKey, zoneId); - } catch (final EmptyResultDataAccessException e) { + } catch (final EmptyResultDataAccessException _) { return Optional.empty(); } return Optional.ofNullable(idpInAliasZone); @@ -129,7 +129,7 @@ protected Optional retrieveEntity(final String id, final String zoneId final ScimUser user; try { user = scimUserProvisioning.retrieve(id, zoneId); - } catch (final ScimResourceNotFoundException e) { + } catch (final ScimResourceNotFoundException _) { return Optional.empty(); } return Optional.ofNullable(user); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimExternalGroupBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimExternalGroupBootstrap.java index 968ecd8803d..c7c3d3944b1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimExternalGroupBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimExternalGroupBootstrap.java @@ -67,12 +67,11 @@ public void setExternalGroupMaps(Map> externalGroupMap this.externalGroupMaps = externalGroupMaps; } - protected ScimGroup addGroup(String groupName) { ScimGroup group = new ScimGroup(null, groupName, identityZoneManager.getCurrentIdentityZoneId()); try { return getScimGroupProvisioning().create(group, identityZoneManager.getCurrentIdentityZoneId()); - } catch (ScimResourceAlreadyExistsException x) { + } catch (ScimResourceAlreadyExistsException _) { List groups = getScimGroupProvisioning().query(GROUP_BY_NAME_AND_ZONE_FILTER.formatted(groupName, identityZoneManager.getCurrentIdentityZoneId()), identityZoneManager.getCurrentIdentityZoneId()); if (groups != null && !groups.isEmpty()) { return groups.getFirst(); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrap.java index 5082c32d958..4c85e827ccb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrap.java @@ -97,7 +97,7 @@ public PropertySource getMessageSource() { String messagesFilename = "messages.properties"; try { messageSource = new ResourcePropertySource(messagesFilename); - } catch (IOException ex) { + } catch (IOException _) { messageSource = new PropertySource.StubPropertySource(messagesFilename); } } @@ -229,7 +229,7 @@ private void addMembers(ScimGroup group) { for (ScimGroupMember member : members) { try { membershipManager.addMember(group.getId(), member, identityZoneManager.getCurrentIdentityZoneId()); - } catch (MemberAlreadyExistsException ex) { + } catch (MemberAlreadyExistsException _) { logger.debug("{} already is member of group {}", member.getMemberId(), name); } } @@ -279,7 +279,7 @@ ScimGroup getGroup(String name) { ScimGroup gr = scimGroupProvisioning.getByName(name, identityZoneManager.getCurrentIdentityZoneId()); gr.setMembers(membershipManager.getMembers(gr.getId(), false, identityZoneManager.getCurrentIdentityZoneId())); return gr; - } catch (ScimResourceNotFoundException | IncorrectResultSizeDataAccessException e) { + } catch (ScimResourceNotFoundException | IncorrectResultSizeDataAccessException _) { logger.debug("could not find group with name"); return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java index ca3ef69aa8d..53a97e79d03 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java @@ -132,7 +132,7 @@ private ScimUser getScimUser(UaaUser user) { if (users.isEmpty() && StringUtils.hasText(user.getId())) { try { users = Collections.singletonList(scimUserProvisioning.retrieve(user.getId(), identityZoneManager.getCurrentIdentityZoneId())); - } catch (ScimResourceNotFoundException x) { + } catch (ScimResourceNotFoundException _) { logger.debug("Unable to find scim user based on ID:{}", user.getId()); } } @@ -265,8 +265,8 @@ public void onApplicationEvent(AuthEvent event) { for (ScimGroup group : groupsMap.values()) { try { membershipManager.removeMemberById(group.getId(), exEvent.getUser().getId(), group.getZoneId()); - } catch (MemberNotFoundException ex) { - // do nothing + } catch (MemberNotFoundException _) { + // ignore } } } @@ -308,8 +308,8 @@ private void addToGroup(String scimUserId, String gName, String origin, boolean ScimGroupMember groupMember = new ScimGroupMember(scimUserId); groupMember.setOrigin(ofNullable(origin).orElse(OriginKeys.UAA)); membershipManager.addMember(group.getId(), groupMember, identityZoneManager.getCurrentIdentityZoneId()); - } catch (MemberAlreadyExistsException | DuplicateKeyException ex) { - // do nothing + } catch (MemberAlreadyExistsException | DuplicateKeyException _) { + // ignore } } @@ -318,7 +318,7 @@ private ScimGroup getOrCreateGroup(String gName, boolean addGroup) { try { group = scimGroupProvisioning.getByName(gName, identityZoneManager.getCurrentIdentityZoneId()); } - catch (IncorrectResultSizeDataAccessException e) { + catch (IncorrectResultSizeDataAccessException _) { if (!addGroup) { logger.debug("No group found with name:{}. Group membership will not be added.", gName); return null; @@ -351,8 +351,8 @@ private void removeFromGroup(String scimUserId, String gName) { } try { membershipManager.removeMemberById(group.getId(), scimUserId, identityZoneManager.getCurrentIdentityZoneId()); - } catch (MemberNotFoundException ex) { - // do nothing + } catch (MemberNotFoundException _) { + // ignore } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java index b1e61d14bee..084d00e9e59 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpoints.java @@ -158,7 +158,7 @@ public SearchResults listGroups( sortBy, "ascending".equalsIgnoreCase(sortOrder), identityZoneManager.getCurrentIdentityZoneId()); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { throw new ScimException("Invalid filter expression: [" + HtmlUtils.htmlEscape(filter) + "]", HttpStatus.BAD_REQUEST); } @@ -178,7 +178,7 @@ public SearchResults listGroups( try { return SearchResultsFactory.buildSearchResultFrom(input, startIndex, count, result.size(), attributes, mapper, Arrays.asList(ScimCore.SCHEMAS)); - } catch (JsonPathException e) { + } catch (JsonPathException _) { throw new ScimException("Invalid attributes: [" + attributesCommaSeparated + "]", HttpStatus.BAD_REQUEST); } } @@ -349,7 +349,7 @@ private String getGroupId(String displayName) { try { return dao.getByName(displayName, identityZoneManager.getCurrentIdentityZoneId()).getId(); - } catch (IncorrectResultSizeDataAccessException e) { + } catch (IncorrectResultSizeDataAccessException _) { throw new ScimException("Group not found:" + displayName, HttpStatus.NOT_FOUND); } } @@ -617,7 +617,7 @@ private int getVersion(String groupId, String etag) { } try { return Integer.valueOf(value); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { throw new ScimException("Invalid version match header (should be a version number): " + etag, HttpStatus.BAD_REQUEST); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java index 7e652b0b452..5755c4f4a68 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java @@ -282,7 +282,7 @@ public ScimUser createUser(@RequestBody ScimUser user, HttpServletRequest reques private ScimUser createScimUserWithAliasHandling(final ScimUser user) { final ScimUser scimUser; try { - scimUser = transactionTemplate.execute(txStatus -> { + scimUser = transactionTemplate.execute(_ -> { final ScimUser originalScimUser = scimUserProvisioning.createUser( user, user.getPassword(), @@ -328,7 +328,7 @@ public ScimUser updateUser(@RequestBody ScimUser user, @PathVariable String user final ScimUser scimUser; try { scimUser = scimUserService.updateUser(userId, user); - } catch (final AliasPropertiesInvalidException e) { + } catch (final AliasPropertiesInvalidException _) { throw new ScimException("The fields 'aliasId' and/or 'aliasZid' are invalid.", HttpStatus.BAD_REQUEST); } catch (final OptimisticLockingFailureException e) { throw new ScimResourceConflictException(e.getMessage()); @@ -483,7 +483,7 @@ private int getVersion(String userId, String etag) { } try { return Integer.parseInt(value); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { throw new ScimException("Invalid version match header (should be a version number): " + etag, HttpStatus.BAD_REQUEST); } @@ -521,7 +521,7 @@ public SearchResults findUsers( } input.add(user); } - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { String msg = "Invalid filter expression: [" + filter + "]"; if (hasText(sortBy)) { msg += " [" + sortBy + "]"; @@ -549,7 +549,7 @@ public SearchResults findUsers( mapper, Arrays.asList(ScimCore.SCHEMAS) ); - } catch (JsonPathException e) { + } catch (JsonPathException _) { throw new ScimException("Invalid attributes: [" + attributesCommaSeparated + "]", HttpStatus.BAD_REQUEST); } } @@ -664,7 +664,7 @@ private void incrementErrorCounts(ScimException e) { synchronized (errorCounts) { value = errorCounts.get(series); if (value == null) { - errorCounts.computeIfAbsent(series, k -> new AtomicInteger(1)); + errorCounts.computeIfAbsent(series, _ -> new AtomicInteger(1)); return; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupExternalMembershipManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupExternalMembershipManager.java index 45b64bbca67..72d821ab6ca 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupExternalMembershipManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupExternalMembershipManager.java @@ -122,7 +122,7 @@ public ScimGroupExternalMember mapExternalGroup(final String groupId, ps.setString(5, zoneId); }); - } catch (DuplicateKeyException e) { + } catch (DuplicateKeyException _) { // we should not throw, if the mapping exist, we should leave it // there. logger.info("The mapping between group {} and external group {} already exists", group.getDisplayName(), externalGroup); @@ -192,7 +192,7 @@ public List getExternalGroupMapsByGroupName( final ScimGroup group; try { group = scimGroupProvisioning.getByName(groupName, zoneId); - } catch (IncorrectResultSizeDataAccessException e) { + } catch (IncorrectResultSizeDataAccessException _) { return null; } @@ -238,7 +238,7 @@ private ScimGroupExternalMember getExternalGroupMap(final String groupId, try { return jdbcTemplate.queryForObject(getGroupsWithExternalGroupMappingsSql, rowMapper, zoneId, groupId, origin, externalGroup); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new ScimResourceNotFoundException("The mapping between groupId " + groupId + " and external group " + externalGroup + " does not exist"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupMembershipManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupMembershipManager.java index 705eef30ed5..9e2d8fdbd40 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupMembershipManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupMembershipManager.java @@ -242,13 +242,13 @@ private void getGroupsWithMember(List results, final List mem while (!memberList.isEmpty()) { int size = maxSqlParameters > 1 ? Math.min(maxSqlParameters - 1, memberList.size()) : memberList.size(); StringBuilder builder = new StringBuilder(dynamicGetGroupsByMemberSqlBase); - builder.append(memberList.subList(0, size).stream().map(s -> "?").collect(Collectors.joining(", "))); + builder.append(memberList.subList(0, size).stream().map(_ -> "?").collect(Collectors.joining(", "))); builder.append(");"); Object[] parameterList = ArrayUtils.addAll(new Object[]{zoneId}, memberList.subList(0, size).toArray()); groups.addAll(jdbcTemplate.query(builder.toString(), new ScimGroupRowMapper(), parameterList)); memberList = memberList.subList(size, memberList.size()); } - } catch (EmptyResultDataAccessException ex) { + } catch (EmptyResultDataAccessException _) { groups = Collections.emptyList(); } @@ -277,7 +277,7 @@ public Set getGroupsWithExternalMember(final String memberId, final S ps.setString(2, memberId); ps.setString(3, origin); }, new ScimGroupRowMapper()); - } catch (EmptyResultDataAccessException ex) { + } catch (EmptyResultDataAccessException _) { results = Collections.emptyList(); } @@ -289,7 +289,7 @@ public ScimGroupMember getMemberById(String groupId, String memberId, String zon MemberNotFoundException { try { return jdbcTemplate.queryForObject(GET_MEMBER_SQL, rowMapper, memberId, groupId, zoneId); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new MemberNotFoundException("Member " + memberId + " does not exist in group " + groupId); } } @@ -405,7 +405,7 @@ private boolean isUser(String uuid) { try { userProvisioning.retrieve(uuid, identityZoneManager.getCurrentIdentityZoneId()); return true; - } catch (ScimResourceNotFoundException ex) { + } catch (ScimResourceNotFoundException _) { return false; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupProvisioning.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupProvisioning.java index 31888c1c40d..cbfd4ea3a84 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupProvisioning.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupProvisioning.java @@ -155,7 +155,7 @@ public void setJdbcIdentityZoneProvisioning(JdbcIdentityZoneProvisioning jdbcIde void createAndIgnoreDuplicate(final String name, final String zoneId) { try { create(new ScimGroup(null, name, zoneId), zoneId); - } catch (ScimResourceAlreadyExistsException ignore) { + } catch (ScimResourceAlreadyExistsException _) { // ignore } } @@ -164,7 +164,7 @@ void createAndIgnoreDuplicate(final String name, final String zoneId) { public ScimGroup createOrGet(ScimGroup group, String zoneId) { try { return getByName(group.getDisplayName(), zoneId); - } catch (IncorrectResultSizeDataAccessException e) { + } catch (IncorrectResultSizeDataAccessException _) { createAndIgnoreDuplicate(group.getDisplayName(), zoneId); return getByName(group.getDisplayName(), zoneId); } @@ -233,7 +233,7 @@ public List retrieveAll(final String zoneId) { public ScimGroup retrieve(String id, final String zoneId) throws ScimResourceNotFoundException { try { return jdbcTemplate.queryForObject(getGroupSql, rowMapper, id, zoneId); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new ScimResourceNotFoundException("Group " + id + " does not exist"); } } @@ -246,7 +246,7 @@ private Set getAllowedUserGroups(String zoneId) { zoneAllowedGroups = currentZone.getId().equals(zoneId) ? currentZone.getConfig().getUserConfig().resultingAllowedGroups() : jdbcIdentityZoneProvisioning.retrieve(zoneId).getConfig().getUserConfig().resultingAllowedGroups(); - } catch (ZoneDoesNotExistsException e) { + } catch (ZoneDoesNotExistsException _) { logger.debug("could not retrieve identity zone with id: {}", zoneId); } return zoneAllowedGroups; @@ -270,7 +270,7 @@ public ScimGroup create(final ScimGroup group, final String zoneId) throws Inval ps.setInt(pos++, group.getVersion()); ps.setString(pos, zoneId); }); - } catch (DuplicateKeyException ex) { + } catch (DuplicateKeyException _) { throw new ScimResourceAlreadyExistsException("A group with displayName: " + group.getDisplayName() + " already exists."); } @@ -299,7 +299,7 @@ public ScimGroup update(final String id, final ScimGroup group, final String zon throw new IncorrectResultSizeDataAccessException(1, updated); } return retrieve(id, zoneId); - } catch (DuplicateKeyException ex) { + } catch (DuplicateKeyException _) { throw new InvalidScimResourceException("A group with displayName: " + group.getDisplayName() + " already exists"); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java index d82b31e9774..21adeebf110 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java @@ -170,7 +170,7 @@ public JdbcScimUserProvisioning( public ScimUser retrieve(String id, String zoneId) { try { return jdbcTemplate.queryForObject(USER_BY_ID_QUERY, mapper, id, zoneId); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new ScimResourceNotFoundException(USER_DOES_NOT_EXIST_MESSAGE.formatted(id)); } } @@ -294,7 +294,7 @@ public ScimUser create(final ScimUser user, String zoneId) { ps.setNull(20, Types.BIGINT); // previous_logon_success_time ps.setString(21, user.getPassword()); }); - } catch (DuplicateKeyException e) { + } catch (DuplicateKeyException _) { String userOrigin = hasText(user.getOrigin()) ? user.getOrigin() : OriginKeys.UAA; Map userDetails = Collections.singletonMap("origin", userOrigin); throw new ScimResourceAlreadyExistsException("Username already in use: " + user.getUserName(), userDetails); @@ -411,7 +411,7 @@ public boolean checkPasswordMatches(String id, CharSequence password, String zon new int[]{VARCHAR, VARCHAR}, String.class ); - } catch (IncorrectResultSizeDataAccessException e) { + } catch (IncorrectResultSizeDataAccessException _) { throw new ScimResourceNotFoundException(USER_DOES_NOT_EXIST_MESSAGE.formatted(id)); } @@ -614,7 +614,7 @@ private UserConfig getUserConfig(String zoneId) throws InvalidScimResourceExcept return currentZone.getId().equals(zoneId) ? currentZone.getConfig().getUserConfig() : jdbcIdentityZoneProvisioning.retrieve(zoneId).getConfig().getUserConfig(); - } catch (ZoneDoesNotExistsException e) { + } catch (ZoneDoesNotExistsException _) { throw new InvalidScimResourceException("Invalid identity zone id: %s".formatted(zoneId)); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserService.java index d0e36fb16ac..f4647ef672a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/services/ScimUserService.java @@ -58,7 +58,7 @@ private ScimUser updateUserWithAliasHandling( final ScimUser user, final ScimUser existingUser ) { - return transactionTemplate.execute(txStatus -> { + return transactionTemplate.execute(_ -> { final ScimUser updatedOriginalUser = scimUserProvisioning.update( userId, user, diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java index 4aa5463db7b..077c3fdcb1d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/IsSelfCheck.java @@ -100,7 +100,7 @@ public boolean isTokenRevocationForSelf(HttpServletRequest request, int index) { if (hasText(userIdFromToken) && userIdFromToken.equals(userIdFromAuthentication)) { return true; } - } catch (EmptyResultDataAccessException x) { + } catch (EmptyResultDataAccessException _) { logger.debug("Token not found:{}", tokenId); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/ScimUserUpdateDiff.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/ScimUserUpdateDiff.java index 13cbb02ad2a..704e1d09f5c 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/ScimUserUpdateDiff.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/ScimUserUpdateDiff.java @@ -22,7 +22,7 @@ public boolean isAnythingOtherThanNameDifferent(String userId, ScimUser scimUser try { scimUserFromDb = scimUserProvisioning.retrieve(userId, zoneId); - } catch (ScimResourceNotFoundException e) { + } catch (ScimResourceNotFoundException _) { return true; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManager.java index ff0943c3e69..64eb0b9b4d4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManager.java @@ -40,7 +40,7 @@ public X509ExpiryCheckingTrustManager() { } } delegate = x509Tm; - } catch (NoSuchAlgorithmException | KeyStoreException ignored) { + } catch (NoSuchAlgorithmException | KeyStoreException _) { } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java index db3965f1c3b..20d0a7246a4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/CorsFilter.java @@ -165,7 +165,7 @@ protected boolean handleRequest(HttpServletRequest request, URI originURI; try { originURI = new URI(origin); - } catch (URISyntaxException e) { + } catch (URISyntaxException _) { log.debug("Request with invalid origin was rejected: %s".formatted(origin)); response.sendError(FORBIDDEN.value(), "Invalid origin"); return true; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java index 50f795fc454..436ae1d9772 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/security/web/SecurityFilterChainPostProcessor.java @@ -347,12 +347,11 @@ public int getPosition(SecurityFilterChain chain) { } } } - switch (placement) { - case POSITION: return position; - case BEFORE: return index; - case AFTER: return Math.min(chain.getFilters().size(), index + 1); - } - return index; + return switch (placement) { + case POSITION -> position; + case BEFORE -> index; + case AFTER -> Math.min(chain.getFilters().size(), index + 1); + }; } public static FilterPosition position(int pos) { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java b/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java index f901931fefe..ff8499934eb 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java @@ -111,7 +111,7 @@ public UaaUser retrieveUserByName(String username, String origin) throws Usernam try { String sql = caseInsensitive ? DEFAULT_CASE_INSENSITIVE_USER_BY_USERNAME_QUERY : DEFAULT_CASE_SENSITIVE_USER_BY_USERNAME_QUERY; return jdbcTemplate.queryForObject(sql, mapper, username.toLowerCase(Locale.US), true, origin, identityZoneManager.getCurrentIdentityZoneId()); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new UsernameNotFoundException(username); } } @@ -121,7 +121,7 @@ public UaaUserPrototype retrieveUserPrototypeByName(String username, String orig try { String sql = caseInsensitive ? DEFAULT_CASE_INSENSITIVE_USER_BY_USERNAME_QUERY : DEFAULT_CASE_SENSITIVE_USER_BY_USERNAME_QUERY; return jdbcTemplate.queryForObject(sql, minimalMapper, username.toLowerCase(Locale.US), true, origin, identityZoneManager.getCurrentIdentityZoneId()); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new UsernameNotFoundException(username); } } @@ -130,7 +130,7 @@ public UaaUserPrototype retrieveUserPrototypeByName(String username, String orig public UaaUser retrieveUserById(String id) throws UsernameNotFoundException { try { return jdbcTemplate.queryForObject(DEFAULT_USER_BY_ID_QUERY, mapper, id, true, identityZoneManager.getCurrentIdentityZoneId()); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new UsernameNotFoundException(id); } } @@ -139,7 +139,7 @@ public UaaUser retrieveUserById(String id) throws UsernameNotFoundException { public UaaUserPrototype retrieveUserPrototypeById(String id) throws UsernameNotFoundException { try { return jdbcTemplate.queryForObject(DEFAULT_USER_BY_ID_QUERY, minimalMapper, id, true, identityZoneManager.getCurrentIdentityZoneId()); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { throw new UsernameNotFoundException(id); } } @@ -174,7 +174,7 @@ public UaaUserPrototype retrieveUserPrototypeByEmail(String email, String origin public UserInfo getUserInfo(String id) { try { return jdbcTemplate.queryForObject("select user_id, info from user_info where user_id = ?", userInfoMapper, id); - } catch (EmptyResultDataAccessException e) { + } catch (EmptyResultDataAccessException _) { logger.debug("No custom attributes stored for user:{}", id); return null; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUserApprovalHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUserApprovalHandler.java index b43fe104066..f5ff2759db5 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUserApprovalHandler.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/user/UaaUserApprovalHandler.java @@ -98,7 +98,7 @@ public AuthorizationRequest checkForPreApproval(AuthorizationRequest authorizati authorizationRequest.setApproved(true); return authorizationRequest; } - } catch (ClientRegistrationException e) { + } catch (ClientRegistrationException _) { logger.warn("Client registration problem prevent autoapproval check for client={}", clientId); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java index d3217933ded..1b904eb102e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAA.java @@ -396,7 +396,7 @@ private static void checkRevocableToken(RevocableTokenProvisioning revocableToke RevocableToken revocableToken = null; try { revocableToken = revocableTokenProvisioning.retrieve(tokenId, IdentityZoneHolder.get().getId()); - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { // ignore exception until null check below } if (revocableToken == null) { @@ -469,8 +469,8 @@ public ClientDetails getClientDetails(MultitenantClientServices clientDetailsSer String clientId = (String) claims.get(CID); try { return clientDetailsService.loadClientByClientId(clientId, IdentityZoneHolder.get().getId()); - } catch (NoSuchClientException x) { - //happens if the client is deleted and token exist + } catch (NoSuchClientException _) { + // happens if the client is deleted and token exist throw new InvalidTokenException("Invalid client ID " + clientId); } } @@ -480,7 +480,7 @@ public UaaUser getUserDetails(UaaUserDatabase userDatabase) { if (UaaTokenUtils.isUserToken(claims)) { try { return userDatabase.retrieveUserById(userId); - } catch (UsernameNotFoundException e) { + } catch (UsernameNotFoundException _) { throw new InvalidTokenException("Token bears a non-existent user ID: " + userId); } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/KeyWithCert.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/KeyWithCert.java index 7618f46e188..3fb33db552e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/KeyWithCert.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/KeyWithCert.java @@ -80,7 +80,7 @@ private boolean keysMatch(PublicKey publicKey, PrivateKey privateKey) { ver.update(data); return ver.verify(signature); - } catch (Exception e) { + } catch (Exception _) { return false; } } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/LinkedMaskingMultiValueMap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/LinkedMaskingMultiValueMap.java index 8c6d99a568b..9782aebf768 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/LinkedMaskingMultiValueMap.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/LinkedMaskingMultiValueMap.java @@ -78,7 +78,7 @@ public LinkedMaskingMultiValueMap(K... maskedAttribute) { @Override public void add(K key, V value) { - List values = this.targetMap.computeIfAbsent(key, k -> new LinkedList<>()); + List values = this.targetMap.computeIfAbsent(key, _ -> new LinkedList<>()); values.add(value); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/MapCollector.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/MapCollector.java index 986f64a73e1..e83aa9ad5d1 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/MapCollector.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/MapCollector.java @@ -32,7 +32,7 @@ public BiConsumer, T> accumulator() { @Override public BinaryOperator> combiner() { - return (left, right) -> { + return (left, _) -> { throw new IllegalStateException("Duplicate key %s".formatted(left)); }; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java index 8855521358e..b1dbf9e087e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtils.java @@ -114,7 +114,7 @@ protected static HttpClientBuilder getClientBuilder(boolean skipSslValidation, i builder.setConnectionManager(cm); if (maxKeepAlive <= 0) { - builder.setConnectionReuseStrategy((request, response, context) -> false); + builder.setConnectionReuseStrategy((_, _, _) -> false); } else { builder.setKeepAliveStrategy(new UaaConnectionKeepAliveStrategy(maxKeepAlive)); } @@ -153,10 +153,9 @@ public static boolean isAcceptedInvitationAuthentication() { return result; } } - } catch (IllegalStateException x) { + } catch (IllegalStateException _) { //nothing bound on thread. logger.debug("Unable to retrieve request attributes looking for invitation."); - } return false; } @@ -183,7 +182,7 @@ public TimeValue getKeepAliveDuration(HttpResponse httpResponse, HttpContext htt if (elementValue != null && elementName != null && elementName.equalsIgnoreCase(TIMEOUT)) { try { result = Math.min(TimeUnit.SECONDS.toMillis(Long.parseLong(elementValue)), connectionKeepAliveMax); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { //Ignore Exception and keep current elementValue of result } break; @@ -243,7 +242,7 @@ public static Map getCredentials(HttpServletRequest request, Lis new TypeReference<>() { }); credentials.putAll(jsonCredentials); - } catch (JsonUtils.JsonUtilException e) { + } catch (JsonUtils.JsonUtilException _) { logger.warn("Unknown format of value for request param: {}. Ignoring.", paramName); } } else { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java index e789019ff8e..cb3f437614d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtils.java @@ -147,7 +147,7 @@ static boolean matchHost(String uriPattern, String requestedUri, AntPathMatcher } hostnameFromRequestedUri = uri.getHost(); } - catch (URISyntaxException ex) { + catch (URISyntaxException _) { return false; } @@ -229,7 +229,7 @@ public static boolean isUrl(String url) { try { new URL(url).toURI(); return true; - } catch (MalformedURLException | URISyntaxException e) { + } catch (MalformedURLException | URISyntaxException _) { return false; } } @@ -301,7 +301,7 @@ public static boolean uriHasMatchingHost(String uri, String hostname) { try { URL url = new URL(uri); return hostname.equals(url.getHost()); - } catch (MalformedURLException e) { + } catch (MalformedURLException _) { return false; } } @@ -378,7 +378,7 @@ public static String normalizeUrlForPortComparison(String url) { return new URI(scheme, uri.getUserInfo(), uri.getHost(), -1, uri.getPath(), uri.getQuery(), uri.getFragment()).toString(); } - } catch (Exception ignored) { + } catch (Exception _) { // ignore } return url; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/AuthorizationManagersUtils.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/AuthorizationManagersUtils.java index cba83423fa1..e4753226a88 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/AuthorizationManagersUtils.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/AuthorizationManagersUtils.java @@ -113,7 +113,7 @@ public AnyOfAuthorizationManager isZoneAdmin() { */ public AnyOfAuthorizationManager hasScope(String... scope) { delegateAuthorizationManagers.add( - (auth, ctx) -> new ScopeTrackingAuthorizationDecision(OAuth2ExpressionUtils.hasAnyScope(auth.get(), scope), scope) + (auth, _) -> new ScopeTrackingAuthorizationDecision(OAuth2ExpressionUtils.hasAnyScope(auth.get(), scope), scope) ); return this; } @@ -123,7 +123,7 @@ public AnyOfAuthorizationManager hasScope(String... scope) { */ public AnyOfAuthorizationManager hasScopeWithZoneId(String scope) { delegateAuthorizationManagers.add( - (auth, ctx) -> { + (auth, _) -> { var securityMethods = new ContextSensitiveOAuth2SecurityExpressionMethods(auth.get()); return new ScopeTrackingAuthorizationDecision(securityMethods.hasScopeInAuthZone(scope), scope); } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/web/SelfCheckAuthorizationManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/web/SelfCheckAuthorizationManager.java index 9d93e0fd60a..6f7ff66e71d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/web/SelfCheckAuthorizationManager.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/web/SelfCheckAuthorizationManager.java @@ -10,7 +10,7 @@ import org.springframework.security.web.access.intercept.RequestAuthorizationContext; public class SelfCheckAuthorizationManager implements AuthorizationManager { - private enum CheckType {USER, TOKEN_REVOCATION_USER, TOKEN_REVOCATION_CLIENT, TOKEN_REVOCATION_SELF}; + private enum CheckType {USER, TOKEN_REVOCATION_USER, TOKEN_REVOCATION_CLIENT, TOKEN_REVOCATION_SELF} private final IsSelfCheck selfCheck; private final int parameterIndex; private final CheckType type; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java index f0a70ae3d7d..013390e0113 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java @@ -112,7 +112,7 @@ protected IdentityZone removeKeys(IdentityZone identityZone) { if (identityZone.getConfig() != null && identityZone.getConfig().getSamlConfig() != null) { identityZone.getConfig().getSamlConfig().setPrivateKeyPassword(null); identityZone.getConfig().getSamlConfig().setPrivateKey(null); - identityZone.getConfig().getSamlConfig().getKeys().forEach((key, value) -> { + identityZone.getConfig().getSamlConfig().getKeys().forEach((_, value) -> { value.setPassphrase(null); value.setKey(null); }); diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java index 7c429aa3de8..0bb20171c0e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilter.java @@ -55,7 +55,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse if (subdomain != null) { try { identityZone = dao.retrieveBySubdomain(subdomain); - } catch (EmptyResultDataAccessException ex) { + } catch (EmptyResultDataAccessException _) { logger.debug("Cannot find identity zone for subdomain {}", subdomain); } catch (Exception ex) { String message = "Internal server error while fetching identity zone for subdomain" + subdomain; diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java index 565178076e0..8dded7c600a 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneSwitchingFilter.java @@ -164,7 +164,8 @@ private IdentityZone validateIdentityZone(String identityZoneId, String identity } else { identityZone = dao.retrieve(identityZoneId); } - } catch (ZoneDoesNotExistsException | EmptyResultDataAccessException ignored) { + } catch (ZoneDoesNotExistsException | EmptyResultDataAccessException _) { + // ignore } return identityZone; } diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsService.java index 599305709c6..06177d6572d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsService.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsService.java @@ -132,7 +132,7 @@ public ClientDetails loadClientByClientId(String clientId, String zoneId) throws ClientDetails details; try { details = jdbcTemplate.queryForObject(selectClientDetailsSql, new ClientDetailsRowMapper(), clientId, zoneId); - } catch (EmptyResultDataAccessException | DataIntegrityViolationException e) { + } catch (EmptyResultDataAccessException | DataIntegrityViolationException _) { throw new NoSuchClientException("No client with requested id: " + clientId); } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java index a94da547b5e..9b53e1f5370 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/account/EmailChangeEmailServiceTest.java @@ -279,7 +279,7 @@ void completeActivationWithInvalidClientId() { Map response = null; try { response = emailChangeEmailService.completeVerification("the_secret_code"); - } catch (NoSuchClientException e) { + } catch (NoSuchClientException _) { assertThat(response).doesNotContainKey("redirect_url"); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/ChainedAuthenticationManagerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/ChainedAuthenticationManagerTest.java index 62cd8b7b288..96a9e8af78b 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/ChainedAuthenticationManagerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/ChainedAuthenticationManagerTest.java @@ -104,7 +104,8 @@ void uaaAuthThrowLdapAuthFalse() { try { authMgr.authenticate(failure); fail("Should have thrown exception"); - } catch (BadCredentialsException ignored) { + } catch (BadCredentialsException _) { + // ignore } verify(authenticateThrow, times(1)).authenticate(any(Authentication.class)); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManagerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManagerTest.java index 3cb39543792..d4f210e8820 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManagerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/PasswordGrantAuthenticationManagerTest.java @@ -202,7 +202,8 @@ void oidcPasswordGrantInvalidLogin() { try { instance.authenticate(auth); fail("No Exception thrown."); - } catch (BadCredentialsException ignored) { + } catch (BadCredentialsException _) { + // ignore } ArgumentCaptor eventArgumentCaptor = ArgumentCaptor.forClass(AbstractUaaEvent.class); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/cache/StaleUrlCacheTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/cache/StaleUrlCacheTests.java index 7202e5956b3..e3b549a79bf 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/cache/StaleUrlCacheTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/cache/StaleUrlCacheTests.java @@ -124,7 +124,7 @@ void calling_twice_uses_cache() throws Exception { @Test void entry_refreshes_after_time() { - when(mockTimeService.getCurrentTimeMillis()).thenAnswer(e -> System.currentTimeMillis()); + when(mockTimeService.getCurrentTimeMillis()).thenAnswer(_ -> System.currentTimeMillis()); when(mockRestTemplate.getForObject(any(URI.class), any())).thenReturn(content1, content2, content3); // populate the cache diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidatorTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidatorTests.java index 7525ae3cadb..58073759645 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidatorTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsValidatorTests.java @@ -260,7 +260,7 @@ void validateValidURLs() { private void testValidatorForInvalidURL(String url) { try { testValidatorForURL(url); - } catch (InvalidClientDetailsException e) { + } catch (InvalidClientDetailsException _) { return; } fail("Url %s should not be allowed".formatted(url)); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrapTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrapTest.java index cb33ee37c91..6b18be8ef02 100755 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrapTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrapTest.java @@ -318,9 +318,9 @@ void oauthAndOidcProviderDeletion() throws Exception { try { provisioning.retrieveByOriginIgnoreActiveFlag(provider.getKey(), IdentityZone.getUaaZoneId()); fail("Provider '%s' should not exist.".formatted(provider.getKey())); - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { + // ignore } - } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase_Tests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase_Tests.java index ab3bdb93f21..4dea31d9756 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase_Tests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/db/V2_7_3__StoreSubDomainAsLowerCase_Tests.java @@ -43,7 +43,7 @@ class V2_7_3__StoreSubDomainAsLowerCase_Tests { void closeConnection() { try { connection.close(); - } catch (Exception ignore) { + } catch (Exception _) { // ignore } } @@ -135,7 +135,7 @@ public void checkDbIsCaseSensitive() { IdentityZone identityZone = MultitenancyFixture.identityZone(subdomain + generator.generate(), subdomain); identityZone.setSubdomain(subdomain); createIdentityZoneThroughSQL(identityZone); - } catch (DuplicateKeyException x) { + } catch (DuplicateKeyException _) { assumeTrue(false, "DB is not case sensitive. No need for this test"); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/PollutionPreventionExtension.java b/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/PollutionPreventionExtension.java index 5091d6268a8..4b83610a492 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/PollutionPreventionExtension.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/PollutionPreventionExtension.java @@ -24,7 +24,8 @@ public void afterAll(ExtensionContext extensionContext) throws SQLException { private ApplicationContext getApplicationContextOrNull(ExtensionContext extensionContext) { try { return SpringExtension.getApplicationContext(extensionContext); - } catch (IllegalStateException ignore) { + } catch (IllegalStateException _) { + // ignore } return null; } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/profiles/ProfileSelectionExtension.java b/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/profiles/ProfileSelectionExtension.java index 4f2da5ff7d8..b24644145ec 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/profiles/ProfileSelectionExtension.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/extensions/profiles/ProfileSelectionExtension.java @@ -63,7 +63,7 @@ private List getActiveProfilesOrNull(ExtensionContext context) { try { var applicationContext = SpringExtension.getApplicationContext(context); return Arrays.asList(applicationContext.getEnvironment().getActiveProfiles()); - } catch (IllegalStateException ignore) { + } catch (IllegalStateException _) { return null; } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java index e860f286803..e7a9f06b870 100755 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpointTests.java @@ -1624,7 +1624,7 @@ void colorsMustBePublic() { (String str) -> { try { return Modifier.isPublic(LoginInfoEndpoint.SavedAccountOptionModel.class.getDeclaredField(str).getModifiers()); - } catch (NoSuchFieldException e) { + } catch (NoSuchFieldException _) { return false; } }; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java index 91842fd8250..ff1d06e9242 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/metrics/UaaMetricsFilterTests.java @@ -239,7 +239,7 @@ void uri_groups_when_fails_to_load() { map.add("/identity-zones", "/identity-zones"); map.add("/identity-zones", "/identity-zones/some/value"); map.add("/saml/login", "/saml/login/value"); - map.forEach((key, value) -> { + map.forEach((_, value) -> { for (String s : value) { setRequestData(s); assertThat(filter.getUriGroup(request).getGroup()).as("Testing URL: " + s).isEqualTo(FALLBACK.getGroup()); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/RestrictUaaScopesClientValidatorTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/RestrictUaaScopesClientValidatorTest.java index 3847368c8ce..097a502deaf 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/RestrictUaaScopesClientValidatorTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/RestrictUaaScopesClientValidatorTest.java @@ -72,14 +72,14 @@ protected void validateClient(List restrictModes, L try { validator.validate(client, m); fail("Scope:" + s + " should not be valid during " + m + " mode."); - } catch (InvalidClientDetailsException x) { - //expected + } catch (InvalidClientDetailsException _) { + // expected } } for (ClientDetailsValidator.Mode m : nonRestrictModes) { try { validator.validate(client, m); - } catch (InvalidClientDetailsException x) { + } catch (InvalidClientDetailsException _) { fail("Scope:" + s + " should be valid during " + m + " mode."); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java index 5ae0d7c9f33..ed34cf37894 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStoreTests.java @@ -291,8 +291,8 @@ void cleanUpUnusedOldTokensMySQLInAnotherTimezone( assertThat(template.queryForObject("SELECT count(*) FROM oauth_code", Integer.class)).isEqualTo(count); try { store.consumeAuthorizationCode(lastCode); - } catch (Exception ignore) { - // ignored + } catch (Exception _) { + // ignore } assertThat(template.queryForObject("SELECT count(*) FROM oauth_code", Integer.class)).isEqualTo(count - 1); } finally { @@ -315,8 +315,8 @@ void cleanUpExpiredTokensDeadlockLoser() throws Exception { String code = store.createAuthorizationCode(clientAuthentication); try { store.consumeAuthorizationCode(code); - } catch (InvalidGrantException ignored) { - // ignored + } catch (InvalidGrantException _) { + // ignore } } } @@ -340,7 +340,7 @@ void countingTheExecutedSqlDeleteStatements() throws SQLException { for (int i = 0; i < 10; i++) { try { store.performExpirationCleanIfEnoughTimeHasElapsed(); - } catch (Exception sqlException) { + } catch (Exception _) { // ignore } } @@ -362,7 +362,7 @@ void countingTheExecutedSqlDeleteStatements() throws SQLException { private static void performExpirationClean(UaaTokenStore store) { try { store.performExpirationCleanIfEnoughTimeHasElapsed(); - } catch (Exception sqlException) { + } catch (Exception _) { // ignore } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java index 5349bff13e1..529b77a2d73 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/client/OAuth2ClientContextFilterTests.java @@ -207,7 +207,7 @@ void currentUriWithInvalidQueryString() { request.setQueryString("foo=bar&code=XXXX&parm=%xx"); try { assertThat(filter.calculateCurrentUri(request)).isNull(); - } catch (IllegalStateException ex) { + } catch (IllegalStateException _) { // OAuth2ClientContextFilter.calculateCurrentUri() internally uses // ServletUriComponentsBuilder.fromRequest(), which behaves differently in Spring Framework 5 // and throws an IllegalStateException for a malformed URI. diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilterTests.java index 8c56f2605c1..92732ec199f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/endpoint/TokenEndpointAuthenticationFilterTests.java @@ -42,7 +42,7 @@ class TokenEndpointAuthenticationFilterTests { private final UaaClientDetails client = new UaaClientDetails("foo", "resource", "scope", "authorization_code", "ROLE_CLIENT"); - private final ClientDetailsService clientDetailsService = clientId -> client; + private final ClientDetailsService clientDetailsService = _ -> client; private final OAuth2RequestFactory oAuth2RequestFactory = new DefaultOAuth2RequestFactory(clientDetailsService); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractDefaultTokenServicesTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractDefaultTokenServicesTests.java index e799cc0a280..99cb9d953ca 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractDefaultTokenServicesTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractDefaultTokenServicesTests.java @@ -49,7 +49,7 @@ public void setUp() throws Exception { @Test public void clientSpecificRefreshTokenExpiry() { getTokenServices().setRefreshTokenValiditySeconds(1000); - getTokenServices().setClientDetailsService(clientId -> { + getTokenServices().setClientDetailsService(_ -> { UaaClientDetails client = new UaaClientDetails(); client.setRefreshTokenValiditySeconds(100); client.setAuthorizedGrantTypes(Arrays.asList("authorization_code", "refresh_token")); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractPersistentDefaultTokenServicesTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractPersistentDefaultTokenServicesTests.java index 0179693e1bb..8d6553f5e79 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractPersistentDefaultTokenServicesTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/provider/token/AbstractPersistentDefaultTokenServicesTests.java @@ -25,7 +25,7 @@ public abstract class AbstractPersistentDefaultTokenServicesTests extends Abstra public void tokenEnhancerUpdatesStoredTokens() { final ExpiringOAuth2RefreshToken refreshToken = new DefaultExpiringOAuth2RefreshToken("testToken", new Date( System.currentTimeMillis() + 100000)); - getTokenServices().setTokenEnhancer((accessToken, authentication) -> { + getTokenServices().setTokenEnhancer((accessToken, _) -> { DefaultOAuth2AccessToken result = new DefaultOAuth2AccessToken(accessToken); result.setRefreshToken(refreshToken); return result; @@ -41,7 +41,7 @@ public void tokenEnhancerUpdatesStoredTokens() { @Test public void refreshedTokenIsEnhanced() { - getTokenServices().setTokenEnhancer((accessToken, authentication) -> { + getTokenServices().setTokenEnhancer((accessToken, _) -> { DefaultOAuth2AccessToken result = new DefaultOAuth2AccessToken(accessToken); result.setValue("I'mEnhanced"); return result; diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/KeyInfoServiceTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/KeyInfoServiceTests.java index ac7178efd6d..f5ae38ed087 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/KeyInfoServiceTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/oauth/token/KeyInfoServiceTests.java @@ -98,7 +98,7 @@ void signedProviderAsymmetricKeys() { keyInfoService.getKeys().values().forEach(keyInfo -> { try { jwkList.add(JWK.parse(keyInfo.getJwkMap())); - } catch (ParseException e) { + } catch (ParseException _) { // ignore } }); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparatorTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparatorTests.java index ac481cd6d0a..3df2cbc6a68 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparatorTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/ldap/DynamicPasswordComparatorTests.java @@ -59,7 +59,8 @@ void encodePassword() { try { comparator.encode("test"); fail("Method and test not implemented yet."); - } catch (UnsupportedOperationException ignored) { + } catch (UnsupportedOperationException _) { + // ignore } } @@ -68,7 +69,8 @@ void isPasswordValid() { try { comparator.matches("test", "test"); fail("Method and test not implemented yet."); - } catch (UnsupportedOperationException ignored) { + } catch (UnsupportedOperationException _) { + // ignore } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProviderUaaTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProviderUaaTests.java index 59ce0da1fec..f05486b6c71 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProviderUaaTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/OpenSaml4AuthenticationProviderUaaTests.java @@ -549,7 +549,7 @@ void updateExistingUserWithDifferentAttributes() throws Exception { try { userDatabase.retrieveUserByName(TEST_USERNAME, OriginKeys.SAML); fail("user should not exist"); - } catch (UsernameNotFoundException ignored) { + } catch (UsernameNotFoundException _) { // expected } authenticate(); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlMetadataEndpointTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlMetadataEndpointTest.java index 37564dfc7cc..e3b67f6400f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlMetadataEndpointTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlMetadataEndpointTest.java @@ -181,7 +181,7 @@ void sha256Signature() throws CertificateEncodingException { when(resolver.resolve(request, REGISTRATION_ID)).thenReturn(registration); ResponseEntity response = endpoint.metadataEndpoint(request); - System.out.println(response.getBody()); + IO.println(response.getBody()); XmlAssert xmlAssert = XmlAssert.assertThat(response.getBody()).withNamespaceContext(xmlNamespaces()); xmlAssert.valueByXPath("/md:EntityDescriptor/@ID").isEqualTo(ENTITY_ID); xmlAssert.valueByXPath("/md:EntityDescriptor/ds:Signature/ds:SignedInfo/ds:SignatureMethod/@Algorithm").isEqualTo(ALGO_ID_SIGNATURE_RSA_SHA256); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/TestOpenSamlObjects.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/TestOpenSamlObjects.java index fa32dd3c37c..3d8fd56891e 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/TestOpenSamlObjects.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/TestOpenSamlObjects.java @@ -127,7 +127,7 @@ public static Response response(String destination, String issuerEntityId) { } static Response signedResponseWithOneAssertion() { - return signedResponseWithOneAssertion(response -> { + return signedResponseWithOneAssertion(_ -> { }); } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/config/InitialConfigTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/config/InitialConfigTest.java index f92029b4ef8..857acac3815 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/config/InitialConfigTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/config/InitialConfigTest.java @@ -45,7 +45,7 @@ class InitialConfigTest { void create() { InitialConfig ic = InitialConfig.create(); assertThat(ic).isNotNull(); - System.out.println("InitialConfigTest.create, RateLimitingEnabled: " + ic.isRateLimitingEnabled()); + IO.println("InitialConfigTest.create, RateLimitingEnabled: " + ic.isRateLimitingEnabled()); } @Test diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/CredentialIdTypeAbstractTestJWT.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/CredentialIdTypeAbstractTestJWT.java index f117662fe01..16a60835356 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/CredentialIdTypeAbstractTestJWT.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/CredentialIdTypeAbstractTestJWT.java @@ -111,7 +111,7 @@ public void checkEmailFromClaims() { when(requestInfo.getAuthorizationHeader()).thenReturn(AUTH_HEADER_VALUE_PREFIX_UC + jwt); id = factory.mapAuthorizationToCredentialsID(requestInfo); assertThat(id).isEqualTo("|" + email + "|"); - System.out.println(email + " -> " + jwt); + IO.println(email + " -> " + jwt); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterTest.java index ab37331bff7..f7a4e9bcb32 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/common/InternalLimiterTest.java @@ -234,7 +234,7 @@ public void run() { coordinator.waitForStart(); for (int i = 0; !checkList(toProcess); i++) { if ((i & 31) == 0) { - System.out.print(threadNumber); + IO.print(threadNumber); } } coordinator.done(); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBucketsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBucketsTest.java index 6e3dd075eab..56f1cc8f5d8 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBucketsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/ExpirationBucketsTest.java @@ -66,8 +66,8 @@ private void assertBadBucketSecondRequest(long second) { try { bucket = buckets.getBucket(second); - } catch (BucketRingBoundsException expected) { - // Ignore + } catch (BucketRingBoundsException _) { + // ignore return; } fail("Expected exception BucketRingBoundsException, but got bucket: " + bucket); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/LimiterManagerImplTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/LimiterManagerImplTest.java index 13b63907906..db59d12cb47 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/LimiterManagerImplTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/LimiterManagerImplTest.java @@ -139,7 +139,7 @@ private void recordCall(List iLimiters) { String callerID; String servletPath; - AuthorizationCredentialIdExtractor credentialIdExtractor = info -> callerID; + AuthorizationCredentialIdExtractor credentialIdExtractor = _ -> callerID; RequestInfo requestInfo = new RequestInfo() { @Override diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/PathFragmentToLimiterMappingsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/PathFragmentToLimiterMappingsTest.java index 751def8acab..4e64762e35f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/PathFragmentToLimiterMappingsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/ratelimiting/internal/limitertracking/PathFragmentToLimiterMappingsTest.java @@ -63,7 +63,7 @@ private int check(boolean expectedFound, String servletPath) { Instant start = Instant.now(); LimiterMapping found = mapper.get(servletPath); int calls = selector.calls; - System.out.println(Duration.between(start, Instant.now()).toNanos() + "ns: " + calls + " -> " + servletPath); + IO.println(Duration.between(start, Instant.now()).toNanos() + "ns: " + calls + " -> " + servletPath); if (expectedFound) { assertThat(found).isNotNull(); } else { diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrapTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrapTests.java index 225eac612ec..acde4fab17f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrapTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimGroupBootstrapTests.java @@ -92,7 +92,7 @@ void initScimGroupBootstrapTests() throws SQLException { @Test void canAddGroups() { - bootstrap.setGroups(StringUtils.commaDelimitedListToSet("org1.dev,org1.qa,org1.engg,org1.mgr,org1.hr").stream().collect(new MapCollector<>(s -> s, s -> null))); + bootstrap.setGroups(StringUtils.commaDelimitedListToSet("org1.dev,org1.qa,org1.engg,org1.mgr,org1.hr").stream().collect(new MapCollector<>(s -> s, _ -> null))); bootstrap.afterPropertiesSet(); assertThat(gDB.retrieveAll(IdentityZone.getUaaZoneId())).hasSize(5); assertThat(bootstrap.getGroup("org1.dev")).isNotNull(); @@ -105,7 +105,7 @@ void canAddGroups() { @Test void allowsBootstrapFromOtherInstance() { //original bootstrap - bootstrap.setGroups(StringUtils.commaDelimitedListToSet("multiple_bootstrap_group").stream().collect(new MapCollector<>(s -> s, s -> null))); + bootstrap.setGroups(StringUtils.commaDelimitedListToSet("multiple_bootstrap_group").stream().collect(new MapCollector<>(s -> s, _ -> null))); bootstrap.afterPropertiesSet(); //mock external bootstrap in between getOrCreate and update calls diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasTests.java index 9462093d50d..4173fbaf05f 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsAliasTests.java @@ -274,7 +274,7 @@ void shouldThrow_IfAliasPropertiesAreInvalid() { void shouldThrow_IfAliasIsLocked() { when(scimUserAliasHandler.aliasPropertiesAreValid(originalUser, existingOriginalUser)) .thenReturn(true); - when(transactionTemplate.execute(any())).then(invocationOnMock -> { + when(transactionTemplate.execute(any())).then(_ -> { throw new OptimisticLockingFailureException("The alias is locked."); }); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java index 1d50be47526..916b4ad0b00 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java @@ -1437,7 +1437,7 @@ void canCreateUserWithValidOrigin() { idzManager.getCurrentIdentityZone().getConfig().getUserConfig().setCheckOriginEnabled(true); try { jdbcScimUserProvisioning.create(scimUser, currentIdentityZoneId); - } catch (InvalidScimResourceException e) { + } catch (InvalidScimResourceException _) { fail("Can't create user with valid origin when origin is checked"); } finally { idzManager.getCurrentIdentityZone().getConfig().getUserConfig().setCheckOriginEnabled(false); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/test/JsonObjectMatcherUtils.java b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/test/JsonObjectMatcherUtils.java index 3078a900575..98494026e9d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/scim/test/JsonObjectMatcherUtils.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/scim/test/JsonObjectMatcherUtils.java @@ -54,7 +54,7 @@ public boolean matches(Object item) { JSONObject actual = null; try { actual = new JSONObject(new JSONTokener(item.toString())); - } catch (JSONException e) { + } catch (JSONException _) { return false; } @@ -70,7 +70,7 @@ public boolean matches(Object item) { if (!Objects.equals(expected.get(name), actual.get(name))) { return false; } - } catch (JSONException e) { + } catch (JSONException _) { return false; } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManagerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManagerTest.java index f6079eeca37..e33e981a0e1 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManagerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/X509ExpiryCheckingTrustManagerTest.java @@ -41,7 +41,7 @@ void checkServerTrusted_throwsExceptionWhenCertIsExpired() throws Exception { try { manager.checkServerTrusted(x509Certificates, "string"); fail(""); - } catch (CertificateExpiredException e) { + } catch (CertificateExpiredException _) { verify(mockedDelegate).checkServerTrusted(x509Certificates, "string"); verify(certificate).checkValidity(); } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java index 9e25f734eaa..2dc2870c985 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterDefaultZoneTests.java @@ -469,8 +469,8 @@ private static void assertXhrCorsPreFlightResponse(final MockHttpServletResponse } private static FilterChain newMockFilterChain() { - return (request, response) -> { - // Do nothing. + return (_, _) -> { + // ignore }; } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java index 2967ec07654..b0866f848a2 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/security/web/CorsFilterNonDefaultZoneTests.java @@ -456,8 +456,8 @@ private void setupBaselineCorsPolicyDefaultConfiguration() { } private static FilterChain newMockFilterChain() { - return (request, response) -> { - // Do nothing. + return (_, _) -> { + // ignore }; } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/test/TestUtils.java b/server/src/test/java/org/cloudfoundry/identity/uaa/test/TestUtils.java index 5eb53fb2f22..d9b3f8d5b92 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/test/TestUtils.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/test/TestUtils.java @@ -78,7 +78,7 @@ private static void cleanAndSeedDb(ApplicationContext applicationContext) throws JdbcTemplate jdbcTemplate; try { jdbcTemplate = applicationContext.getBean(JdbcTemplate.class); - } catch (NoSuchBeanDefinitionException ignored) { + } catch (NoSuchBeanDefinitionException _) { return; } @@ -118,8 +118,8 @@ private static void bootstrapDb(ApplicationContext applicationContext) { try { ClientAdminBootstrap bootstrap = applicationContext.getBean(ClientAdminBootstrap.class); bootstrap.afterPropertiesSet(); - } catch (Exception ignored) { - + } catch (Exception _) { + // ignore } } @@ -127,8 +127,8 @@ private static void tryCallAfterPropertiesSet(Appli try { InitializingBean bootstrap = applicationContext.getBean(clazz); bootstrap.afterPropertiesSet(); - } catch (Exception ignored) { - + } catch (Exception _) { + // ignore } } @@ -144,10 +144,10 @@ public static void resetIdentityZoneHolder(ApplicationContext applicationContext try { IdentityZoneHolder.setProvisioning(applicationContext.getBean(JdbcIdentityZoneProvisioning.class)); IdentityZoneHolder.setSamlKeyManagerFactory(applicationContext.getBean(SamlKeyManagerFactory.class)); - } catch (NoSuchBeanDefinitionException ignored) { + } catch (NoSuchBeanDefinitionException _) { try { IdentityZoneHolder.setProvisioning(new JdbcIdentityZoneProvisioning(applicationContext.getBean(JdbcTemplate.class))); - } catch (NoSuchBeanDefinitionException ignoredAgain) { + } catch (NoSuchBeanDefinitionException _) { IdentityZoneHolder.setProvisioning(null); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java index 6013b8b900a..1f8934dc2df 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java @@ -391,7 +391,7 @@ void maxParameters() { validateBob(5, jdbcUaaUserDatabase.retrieveUserByName("bob", OriginKeys.UAA), l); for (int i = 5; i < 10; i++) { - System.out.println(i); + IO.println(i); addAuthority("testAuth" + l + i, jdbcTemplate, "zone-the-bob", BOB_ID); } validateBob(10, jdbcUaaUserDatabase.retrieveUserByName("bob", OriginKeys.UAA), l); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/user/UaaUserTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/user/UaaUserTests.java index 01c232c97a0..7a4f05778a5 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/user/UaaUserTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/user/UaaUserTests.java @@ -59,7 +59,7 @@ void defaultsUsernameToEmail() { @Test void defaultsUsernameToUnknownWhenNoEmailPresent() { - UaaUser user = UaaUser.createWithDefaults(u -> { + UaaUser user = UaaUser.createWithDefaults(_ -> { }); assertThat(user.getUsername()).isEqualTo(UaaUser.DEFAULT_USER_NAME); } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAATest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAATest.java index 2ee86262113..84629ed6c82 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAATest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/util/JwtTokenSignedByThisUAATest.java @@ -750,6 +750,6 @@ void readScopesFromClaim_rejects_non_string_scopes() { void nullUserIsCaught() { assertThatExceptionOfType(InvalidTokenException.class).isThrownBy(() -> buildAccessTokenValidator(getToken(), new KeyInfoService("https://localhost")) - .checkUser(uid -> null)); + .checkUser(_ -> null)); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/util/PredicateMatcher.java b/server/src/test/java/org/cloudfoundry/identity/uaa/util/PredicateMatcher.java index c8f72a2ce88..034ee163e07 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/util/PredicateMatcher.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/util/PredicateMatcher.java @@ -38,7 +38,7 @@ public static Matcher> has(Predicate predicate) { public boolean matches(Object item) { try { return predicate.test((T) item); - } catch (ClassCastException ex) { + } catch (ClassCastException _) { return false; } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java index e48a614b59c..99cbb0a1c4e 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaHttpRequestUtilsTest.java @@ -135,8 +135,8 @@ public void testHttpProxy(String url, int expectedPort, String expectedHost, boo RestTemplate template = new RestTemplate(UaaHttpRequestUtils.createRequestFactory(builder, Integer.MAX_VALUE, Integer.MAX_VALUE)); try { template.getForObject(url, String.class); - } catch (Exception ignored) { - // ignored + } catch (Exception _) { + // ignore } assertThat(routePlanner.routes).hasSize(1); assertThat(routePlanner.routes.getFirst().getProxyHost().getHostName()).isEqualTo(expectedHost); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java index 82e6804019f..d5283033307 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/util/UaaUrlUtilsTest.java @@ -672,7 +672,7 @@ private static void validateRedirectUri(List urls, boolean result) { Map failed = getUnsuccessfulUrls(urls, result); if (!failed.isEmpty()) { StringBuilder builder = new StringBuilder("\n"); - failed.forEach((key, value) -> builder.append(value).append("\n")); + failed.forEach((_, value) -> builder.append(value).append("\n")); fail(builder.toString()); } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpointsTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpointsTests.java index c580bcd6f3a..41acfc223f3 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpointsTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpointsTests.java @@ -117,7 +117,7 @@ void remove_keys_from_map() { assertThat(identityZone.getConfig().getSamlConfig().getPrivateKey()).isNull(); assertThat(identityZone.getConfig().getSamlConfig().getPrivateKeyPassword()).isNull(); - identityZone.getConfig().getSamlConfig().getKeys().forEach((key, value) -> { + identityZone.getConfig().getSamlConfig().getKeys().forEach((_, value) -> { assertThat(value.getKey()).isNull(); assertThat(value.getPassphrase()).isNull(); }); @@ -132,7 +132,7 @@ void restore_keys() { assertThat(identityZone.getConfig().getSamlConfig().getPrivateKey()).isNotNull(); assertThat(identityZone.getConfig().getSamlConfig().getPrivateKeyPassword()).isNotNull(); - identityZone.getConfig().getSamlConfig().getKeys().forEach((key, value) -> { + identityZone.getConfig().getSamlConfig().getKeys().forEach((_, value) -> { assertThat(value.getKey()).isNotNull(); assertThat(value.getPassphrase()).isNotNull(); }); @@ -225,7 +225,7 @@ private static IdentityZone createZone() { assertThat(zone.getConfig().getSamlConfig().getPrivateKey()).isNotNull(); assertThat(zone.getConfig().getSamlConfig().getPrivateKeyPassword()).isNotNull(); - zone.getConfig().getSamlConfig().getKeys().forEach((key, value) -> { + zone.getConfig().getSamlConfig().getKeys().forEach((_, value) -> { assertThat(value.getKey()).isNotNull(); assertThat(value.getPassphrase()).isNotNull(); }); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java index 6fcb95e6b0d..cea65005d7d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneResolvingFilterTests.java @@ -134,7 +134,7 @@ private void assertFindsCorrectSubdomain(final String subDomainInput, final Stri identityZone.setSubdomain(subDomainInput); try { identityZone = dao.create(identityZone); - } catch (ZoneAlreadyExistsException x) { + } catch (ZoneAlreadyExistsException _) { identityZone = dao.retrieveBySubdomain(subDomainInput); } assertThat(identityZone.getSubdomain()).isEqualTo(expectedSubdomain); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityZoneProvisioningTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityZoneProvisioningTests.java index 4d09b33de2e..0c9354fb686 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityZoneProvisioningTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityZoneProvisioningTests.java @@ -189,7 +189,7 @@ void createDuplicateIdentityZone() { try { jdbcIdentityZoneProvisioning.create(identityZone); fail("Should have thrown exception"); - } catch (ZoneAlreadyExistsException e) { + } catch (ZoneAlreadyExistsException _) { // success } } @@ -203,7 +203,7 @@ void createDuplicateIdentityZoneSubdomain() { identityZone.setId(new RandomValueStringGenerator().generate()); jdbcIdentityZoneProvisioning.create(identityZone); fail("Should have thrown exception"); - } catch (ZoneAlreadyExistsException e) { + } catch (ZoneAlreadyExistsException _) { // success } } diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsServiceTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsServiceTests.java index 75ee2f914b7..18d83ed3932 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsServiceTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/zone/MultitenantJdbcClientDetailsServiceTests.java @@ -113,7 +113,8 @@ void deleteByClientId() { when(mockIdentityZoneManager.getCurrentIdentityZoneId()).thenReturn(zoneId); try { service.removeClientDetails("some-client-id"); - } catch (Exception ignored) { + } catch (Exception _) { + // ignore } verify(service, times(1)).deleteByClient(eq("some-client-id"), eq(zoneId)); reset(service); @@ -130,7 +131,8 @@ void deleteByClientRespectsZoneIdParam() { when(mockIdentityZoneManager.getCurrentIdentityZoneId()).thenReturn(zoneId); try { service.deleteByClient("some-client-id", "zone-id"); - } catch (Exception ignored) { + } catch (Exception _) { + // ignore } verify(service, times(1)).deleteByClient(eq("some-client-id"), eq("zone-id")); verify(spyJdbcTemplate, times(1)).update(DEFAULT_DELETE_STATEMENT, "some-client-id", "zone-id"); diff --git a/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/MBeanMap.java b/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/MBeanMap.java index 7db4a8c9226..2f65c5372bc 100644 --- a/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/MBeanMap.java +++ b/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/MBeanMap.java @@ -67,7 +67,7 @@ public Set> entrySet() { try { Object value = server.getAttribute(name, key); verySafePut(map, key, value); - } catch (Exception e) { + } catch (Exception _) { logger.trace("Cannot extract attribute: {}", key); } } @@ -82,7 +82,7 @@ public Set> entrySet() { try { Object value = server.invoke(name, key, null, null); verySafePut(map, attribute, value); - } catch (Exception e) { + } catch (Exception _) { logger.trace("Cannot extract operation: {}", key); } } diff --git a/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/UaaMetricsEmitter.java b/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/UaaMetricsEmitter.java index 4bf9b92b90b..57d74e6fc49 100644 --- a/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/UaaMetricsEmitter.java +++ b/statsd-lib/src/main/java/org/cloudfoundry/identity/statsd/UaaMetricsEmitter.java @@ -217,7 +217,7 @@ public void enableNotification() { try { logger.debug("Trying to enable notification"); NotificationEmitter emitter = metricsUtils.getUaaMetricsSubscriber(server); - emitter.addNotificationListener((notification, handback) -> { + emitter.addNotificationListener((notification, _) -> { String key = notification.getType(); String prefix = key.startsWith("/") ? key.substring(1) : key; statsDClient.time("requests.%s.latency".formatted(prefix), (Long) notification.getSource()); diff --git a/statsd-lib/src/test/java/org/cloudfoundry/identity/statsd/integration/UaaMetricsEmitterIT.java b/statsd-lib/src/test/java/org/cloudfoundry/identity/statsd/integration/UaaMetricsEmitterIT.java index 0e743a55ca1..563be83c861 100644 --- a/statsd-lib/src/test/java/org/cloudfoundry/identity/statsd/integration/UaaMetricsEmitterIT.java +++ b/statsd-lib/src/test/java/org/cloudfoundry/identity/statsd/integration/UaaMetricsEmitterIT.java @@ -128,7 +128,7 @@ private static Map getMessages(List fragments) throws IO results.put(fragment, message); } }); - } catch (SocketTimeoutException e) { + } catch (SocketTimeoutException _) { //expected so that we keep looping } } while (results.size() < fragments.size() && (System.nanoTime() < (startTime + UaaMetricsEmitterIT.WAIT_FOR_MESSAGE))); diff --git a/uaa/src/main/java/org/cloudfoundry/identity/uaa/brave/WebMvcRuntime.java b/uaa/src/main/java/org/cloudfoundry/identity/uaa/brave/WebMvcRuntime.java index 3eb4617bffd..889038433a7 100644 --- a/uaa/src/main/java/org/cloudfoundry/identity/uaa/brave/WebMvcRuntime.java +++ b/uaa/src/main/java/org/cloudfoundry/identity/uaa/brave/WebMvcRuntime.java @@ -25,7 +25,7 @@ static WebMvcRuntime findWebMvcRuntime() { try { Class.forName("org.springframework.web.method.HandlerMethod"); return new WebMvc31(); // intentionally doesn't access the type prior to the above guard - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException _) { // pre spring-webmvc v3.1 } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/YamlConfigurationValidationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/YamlConfigurationValidationTests.java index a8df98aab90..a4af2d7aefc 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/YamlConfigurationValidationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/YamlConfigurationValidationTests.java @@ -60,7 +60,6 @@ private static TestApplicationContext createApplicationContext() { return applicationContext; } - static class TestApplicationContext extends AnnotationConfigWebApplicationContext { @Override @@ -70,15 +69,10 @@ protected void loadBeanDefinitions(@NonNull DefaultListableBeanFactory beanFacto } } - ; - static class TestMockContext extends MockServletContext { @Override public void addListener(@Nullable T t) { //no op } } - - ; - } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManagerTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManagerTest.java index e2bc2556478..2bd4b739ca1 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManagerTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/DynamicZoneAwareAuthenticationManagerTest.java @@ -117,8 +117,8 @@ void nonUAAZoneUaaActiveAccountNotVerified() { try { manager.authenticate(success); fail("Expected AccountNotVerifiedException "); - } catch (AccountNotVerifiedException x) { - //expected + } catch (AccountNotVerifiedException _) { + // expected } verify(mockManager, times(0)).authenticate(any(Authentication.class)); } @@ -134,8 +134,8 @@ void nonUAAZoneUaaActiveAccountLocked() { try { manager.authenticate(success); fail("Expected AuthenticationPolicyRejectionException "); - } catch (AuthenticationPolicyRejectionException x) { - //expected + } catch (AuthenticationPolicyRejectionException _) { + // expected } verify(mockManager, times(0)).authenticate(any(Authentication.class)); } @@ -190,8 +190,8 @@ void authenticateInNoneUaaZoneWithInactiveProviders() { try { manager.authenticate(success); fail("Was expecting a " + ProviderNotFoundException.class); - } catch (ProviderNotFoundException x) { - //expected + } catch (ProviderNotFoundException _) { + // expected } verifyNoInteractions(uaaAuthenticationMgr); verifyNoInteractions(mockManager); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java index 286ab81235e..7915894b8e0 100755 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java @@ -209,7 +209,7 @@ void authorizationRequestWithoutRedirectUri() { IntegrationTestUtils.getAuthorizationCodeTokenMap(serverRunning, "app", "appclientsecret", testAccounts.getUserName(), testAccounts.getPassword(), null, null, null, null, false); - } catch (AssertionError error) { + } catch (AssertionError _) { // expected return; } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java index d063c4420a5..d67a00033d3 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java @@ -189,7 +189,7 @@ void invalidScope() { @SuppressWarnings("rawtypes") ResponseEntity response = serverRunning.postForMap("/check_token", requestBody, headers); - System.out.println(response.getBody()); + IO.println(response.getBody()); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); @SuppressWarnings("unchecked") @@ -214,7 +214,7 @@ void validPasswordGrant() { ResponseEntity tokenResponse = serverRunning.postForMap("/check_token", formData, tokenHeaders); assertThat(tokenResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(tokenResponse.getBody()).isNotNull(); - System.out.println(tokenResponse.getBody()); + IO.println(tokenResponse.getBody()); @SuppressWarnings("unchecked") Map map = tokenResponse.getBody(); @@ -238,7 +238,7 @@ void addidionalAttributes() { ResponseEntity tokenResponse = serverRunning.postForMap("/check_token", formData, tokenHeaders); assertThat(tokenResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(tokenResponse.getBody()).isNotNull(); - System.out.println(tokenResponse.getBody()); + IO.println(tokenResponse.getBody()); @SuppressWarnings("unchecked") Map map = tokenResponse.getBody(); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java index 81de4efc809..ce5df9a0c01 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/IntrospectEndpointIntegrationTests.java @@ -201,7 +201,7 @@ void validPasswordGrantClientSecretAuth() { ResponseEntity introspectResponse = serverRunning.postForMap("/introspect", formData, tokenHeaders); assertThat(introspectResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(introspectResponse.getBody()).isNotNull(); - System.out.println(introspectResponse.getBody()); + IO.println(introspectResponse.getBody()); @SuppressWarnings("unchecked") Map map = introspectResponse.getBody(); @@ -224,7 +224,7 @@ void validPasswordGrantClientSecretAuthWithSpecialCharacters() { ResponseEntity introspectResponse = serverRunning.postForMap("/introspect", formData, tokenHeaders); assertThat(introspectResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(introspectResponse.getBody()).isNotNull(); - System.out.println(introspectResponse.getBody()); + IO.println(introspectResponse.getBody()); @SuppressWarnings("unchecked") Map map = introspectResponse.getBody(); @@ -248,7 +248,7 @@ void validPasswordGrantClientTokenAuth() { ResponseEntity introspectResponse = serverRunning.postForMap("/introspect", formData, tokenHeaders); assertThat(introspectResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(introspectResponse.getBody()).isNotNull(); - System.out.println(introspectResponse.getBody()); + IO.println(introspectResponse.getBody()); @SuppressWarnings("unchecked") Map map = introspectResponse.getBody(); @@ -272,7 +272,7 @@ void validPasswordGrantClientTokenAuthWithSpecialCharacters() { ResponseEntity introspectResponse = serverRunning.postForMap("/introspect", formData, tokenHeaders); assertThat(introspectResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(introspectResponse.getBody()).isNotNull(); - System.out.println(introspectResponse.getBody()); + IO.println(introspectResponse.getBody()); @SuppressWarnings("unchecked") Map map = introspectResponse.getBody(); @@ -297,7 +297,7 @@ void validPasswordGrantValidClientTokenAndInvalidBasicAuth() { ResponseEntity introspectResponse = serverRunning.postForMap("/introspect", formData, tokenHeaders); assertThat(introspectResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(introspectResponse.getBody()).isNotNull(); - System.out.println(introspectResponse.getBody()); + IO.println(introspectResponse.getBody()); @SuppressWarnings("unchecked") Map map = introspectResponse.getBody(); @@ -401,7 +401,7 @@ void addidionalAttributes() { ResponseEntity introspectResponse = serverRunning.postForMap("/introspect", formData, tokenHeaders); assertThat(introspectResponse.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(introspectResponse.getBody()).isNotNull(); - System.out.println(introspectResponse.getBody()); + IO.println(introspectResponse.getBody()); @SuppressWarnings("unchecked") Map map = introspectResponse.getBody(); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PrintSmtpToScreen.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PrintSmtpToScreen.java index 8d1c2dfe125..e0b83d97e4f 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PrintSmtpToScreen.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/PrintSmtpToScreen.java @@ -25,7 +25,7 @@ public class PrintSmtpToScreen { public static void main(String... args) throws Exception { final SimpleSmtpServer server = SimpleSmtpServer.start(2525); Runtime.getRuntime().addShutdownHook(new Thread(() -> { - System.out.println("Stopping SMTP server"); + IO.println("Stopping SMTP server"); server.stop(); })); @@ -34,7 +34,7 @@ public static void main(String... args) throws Exception { while (iterator.hasNext()) { SmtpMessage m = (SmtpMessage) iterator.next(); iterator.remove(); - System.out.println(m.getBody()); + IO.println(m.getBody()); } Thread.sleep(250); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/SessionControllerIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/SessionControllerIntegrationTests.java index b3a260d46de..8c6e9f0331b 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/SessionControllerIntegrationTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/SessionControllerIntegrationTests.java @@ -30,7 +30,7 @@ class SessionControllerIntegrationTests { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } @@ -43,7 +43,7 @@ void sessionPageHasTheFunction() { "/session?clientId=admin&messageOrigin=http://localhost:8080"); WebDriverWait wait = webDriver.createWebDriverWait(); - Object type = wait.until(driver -> webDriver.getJavascriptExecutor().executeScript( + Object type = wait.until(_ -> webDriver.getJavascriptExecutor().executeScript( "return typeof(handleMessage);")); assertThat(type).hasToString("function"); @@ -57,13 +57,13 @@ void sessionManagementPageHasVariablesSet() { // Use WebDriverWait to wait for the variable to exist (prevents race conditions) // return null instead of crashing if undefined (better assertion handling) WebDriverWait wait = webDriver.createWebDriverWait(); - Object clientId = wait.until(driver -> webDriver.getJavascriptExecutor().executeScript( + Object clientId = wait.until(_ -> webDriver.getJavascriptExecutor().executeScript( "return (typeof clientId !== 'undefined') ? clientId : null;")); assertThat(clientId).as("Global variable 'clientId' should match URL param") .hasToString("admin"); - Object origin = wait.until(driver -> webDriver.getJavascriptExecutor().executeScript( + Object origin = wait.until(_ -> webDriver.getJavascriptExecutor().executeScript( "return (typeof messageOrigin !== 'undefined') ? messageOrigin : null;")); assertThat(origin).as("Global variable 'messageOrigin' should match URL param") diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AppApprovalIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AppApprovalIT.java index 76efc408b43..858852505e1 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AppApprovalIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AppApprovalIT.java @@ -74,7 +74,7 @@ void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AutologinIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AutologinIT.java index f2872dc1129..c72d12b8322 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AutologinIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/AutologinIT.java @@ -81,7 +81,7 @@ void logout_and_clear_cookies() { map.add("password", testAccounts.getPassword()); try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangeEmailIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangeEmailIT.java index e2d05c835b0..5a55d34dfa0 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangeEmailIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangeEmailIT.java @@ -44,7 +44,7 @@ class ChangeEmailIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangePasswordIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangePasswordIT.java index 0140671aee8..cf40dc899bf 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangePasswordIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ChangePasswordIT.java @@ -63,7 +63,7 @@ public class ChangePasswordIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/CreateAccountIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/CreateAccountIT.java index 1754f263302..ff42b6b2189 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/CreateAccountIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/CreateAccountIT.java @@ -67,7 +67,7 @@ class CreateAccountIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ErrorRoutingIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ErrorRoutingIT.java index d30b1568c68..cb67c823141 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ErrorRoutingIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ErrorRoutingIT.java @@ -112,7 +112,7 @@ private String getResponseBody(HttpURLConnection connection) throws IOException while ((charsRead = reader.read(buffer, 0, bufferSize)) != -1) { sb.append(buffer, 0, charsRead); } - } catch (IOException ie) { + } catch (IOException _) { IOUtils.close(connection); } return sb.toString(); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ForcedPasswordChangeIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ForcedPasswordChangeIT.java index 298d36e0875..9e3b5700967 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ForcedPasswordChangeIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ForcedPasswordChangeIT.java @@ -70,7 +70,7 @@ class ForcedPasswordChangeIT { void logoutAndClearCookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HealthzIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HealthzIT.java index f78195aa447..bc1976bbfb1 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HealthzIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HealthzIT.java @@ -43,7 +43,7 @@ class HealthzIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HomeIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HomeIT.java index a507501e535..c16e8b74021 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HomeIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/HomeIT.java @@ -58,7 +58,7 @@ class HomeIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } @@ -86,7 +86,7 @@ void profilePage() { try { homePage.goHome().assertThatPageSource().contains("Where to?"); webDriver.pressUaaNavigation("nav-dropdown-button", "nav-dropdown-content-profile"); - } catch (TimeoutException e) { + } catch (TimeoutException _) { webDriver.get(baseUrl + "/profile"); } assertThat(webDriver.findElement(By.cssSelector("h1")).getText()).contains("Account Settings"); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ImplicitGrantIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ImplicitGrantIT.java index 4df5373a496..a0483f92a99 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ImplicitGrantIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ImplicitGrantIT.java @@ -74,7 +74,7 @@ public class ImplicitGrantIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } @@ -148,7 +148,7 @@ void invalidScopes() { assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.FOUND); - System.out.println("responseEntity.getHeaders().getLocation() = " + responseEntity.getHeaders().getLocation()); + IO.println("responseEntity.getHeaders().getLocation() = " + responseEntity.getHeaders().getLocation()); UriComponents locationComponents = UriComponentsBuilder.fromUri(responseEntity.getHeaders().getLocation()).build(); assertThat(locationComponents.getHost()).isEqualTo("localhost"); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/InvitationsIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/InvitationsIT.java index b9f4d43d40f..a497084e162 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/InvitationsIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/InvitationsIT.java @@ -98,7 +98,7 @@ public static String createInvitation(String baseUrl, String username, String us try { userId = IntegrationTestUtils.getUserIdByField(scimToken, baseUrl, origin, "email", userEmail); scimUser = IntegrationTestUtils.getUser(scimToken, baseUrl, userId); - } catch (RuntimeException ignored) { + } catch (RuntimeException _) { // ignored } if (userId == null) { @@ -155,7 +155,7 @@ void setup() { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } @@ -201,7 +201,7 @@ public void performInviteUser(String email, boolean isVerified) { String currentUserId = null; try { currentUserId = IntegrationTestUtils.getUserId(scimToken, baseUrl, OriginKeys.UAA, email); - } catch (RuntimeException ignored) { + } catch (RuntimeException _) { // ignored } assertThat(currentUserId).isEqualTo(invitedUserId); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/JWTBearerGrantIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/JWTBearerGrantIT.java index 863d4890377..b80d45fe2dd 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/JWTBearerGrantIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/JWTBearerGrantIT.java @@ -67,7 +67,7 @@ class JWTBearerGrantIT { private static boolean doesSupportZoneDNS() { try { return Arrays.equals(Inet4Address.getByName("testzone3.localhost").getAddress(), new byte[]{127, 0, 0, 1}); - } catch (UnknownHostException e) { + } catch (UnknownHostException _) { return false; } } @@ -78,7 +78,7 @@ void logout_and_clear_cookies() { assertThat(doesSupportZoneDNS()).as("/etc/hosts should contain the host 'testzone3/4.localhost' for this test to work").isTrue(); try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LdapLoginIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LdapLoginIT.java index 4295b461cfc..c236d1072c3 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LdapLoginIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LdapLoginIT.java @@ -197,7 +197,7 @@ private void saveAlertErrorMessage() { try { WebElement element = webDriver.findElement(By.className("alert-error")); alertError = Optional.of(element.getText()); - } catch (NoSuchElementException e) { + } catch (NoSuchElementException _) { // do nothing } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LoginIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LoginIT.java index c7821df0086..7773ccc40d0 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LoginIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/LoginIT.java @@ -83,7 +83,7 @@ class LoginIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OIDCLoginIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OIDCLoginIT.java index c8f44da763a..a829028f202 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OIDCLoginIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OIDCLoginIT.java @@ -117,7 +117,7 @@ public class OIDCLoginIT { public static boolean doesSupportZoneDNS() { try { return Arrays.equals(Inet4Address.getByName("oidcloginit.localhost").getAddress(), new byte[]{127, 0, 0, 1}); - } catch (UnknownHostException e) { + } catch (UnknownHostException _) { return false; } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java index b5da5812339..019d99d6e45 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OpenIdTokenGrantsIT.java @@ -106,7 +106,7 @@ void setUp() { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordGrantIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordGrantIT.java index 9ccab35903c..60d8d90bf34 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordGrantIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/PasswordGrantIT.java @@ -64,7 +64,7 @@ class PasswordGrantIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/RateLimitingIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/RateLimitingIT.java index b77829b3d01..26491d8f8d6 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/RateLimitingIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/RateLimitingIT.java @@ -55,7 +55,7 @@ class RateLimitingIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } @@ -74,7 +74,7 @@ void infoEndpointRateLimited() throws InterruptedException { //Limit on /info is set to 20 List responses = new ArrayList<>(requestCount); //Many Requests should hit the RL - IntStream.range(0, requestCount).forEach(x -> responses.add(restTemplate.getForEntity(baseUrl + "/info", String.class))); + IntStream.range(0, requestCount).forEach(_ -> responses.add(restTemplate.getForEntity(baseUrl + "/info", String.class))); //Check numbers long limits = responses.stream().filter(s -> HttpStatus.TOO_MANY_REQUESTS.equals(s.getStatusCode())).count(); long oKs = responses.stream().filter(s -> HttpStatus.OK.equals(s.getStatusCode())).count(); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ResetPasswordIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ResetPasswordIT.java index 4907795a840..cffe7d382b6 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ResetPasswordIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ResetPasswordIT.java @@ -71,7 +71,7 @@ class ResetPasswordIT { void logoutAndClearCookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginCustomUserAttributesIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginCustomUserAttributesIT.java index 0ceb61a7b76..7d16befa44d 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginCustomUserAttributesIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginCustomUserAttributesIT.java @@ -131,7 +131,7 @@ void afterEach() { try { IntegrationTestUtils.deleteZone(baseUrl, zoneId, token); IntegrationTestUtils.deleteProvider(token, baseUrl, "uaa", zoneId + ".cloudfoundry-saml-login"); - } catch (Exception ignored) { + } catch (Exception _) { // ignored } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginEmailIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginEmailIT.java index 19fcce0bd45..4d1982e57f5 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginEmailIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginEmailIT.java @@ -130,7 +130,7 @@ void afterEach() { try { IntegrationTestUtils.deleteZone(baseUrl, zoneId, token); IntegrationTestUtils.deleteProvider(token, baseUrl, "uaa", zoneId + ".cloudfoundry-saml-login"); - } catch (Exception ignored) { + } catch (Exception _) { // ignored } } @@ -214,7 +214,7 @@ void samlLoginEmailInIDTokenWhenUserIDIsNotEmail() { // do an auth code grant, passing the jsessionid Cookie cookie = webDriver.manage().getCookieNamed("JSESSIONID"); - System.out.println("cookie = " + "%s=%s".formatted(cookie.getName(), cookie.getValue())); + IO.println("cookie = " + "%s=%s".formatted(cookie.getName(), cookie.getValue())); serverRunning.setHostName(zoneId + ".localhost"); Map authCodeTokenResponse = IntegrationTestUtils.getAuthorizationCodeTokenMap(serverRunning, diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginIT.java index eef54af017e..6fc843ad9b0 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginIT.java @@ -183,7 +183,7 @@ void afterEach() { try { IntegrationTestUtils.deleteZone(baseUrl, zoneId, token); IntegrationTestUtils.deleteProvider(token, baseUrl, "uaa", zoneId + ".cloudfoundry-saml-login"); - } catch (Exception ignored) { + } catch (Exception _) { // ignored } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SessionLossDuringOauthFlowIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SessionLossDuringOauthFlowIT.java index 740f629ab4f..49f7f49128b 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SessionLossDuringOauthFlowIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SessionLossDuringOauthFlowIT.java @@ -75,7 +75,7 @@ void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/TestClient.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/TestClient.java index dc93dc10809..727c7626dc7 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/TestClient.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/TestClient.java @@ -111,7 +111,7 @@ public String createClientJwt(String clientId, String keyId, String jwks) { config.setJwtClientAuthentication(oidcKeyInfo); try { config.setTokenUrl(new URL(baseUrl + "/oauth/token")); - } catch (MalformedURLException e) { + } catch (MalformedURLException _) { return ""; } LegacyTokenKey.setLegacySigningKey(jwks, baseUrl); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/UserTokenGrantIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/UserTokenGrantIT.java index 7efe832e992..0d79a8e09f7 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/UserTokenGrantIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/UserTokenGrantIT.java @@ -55,7 +55,7 @@ class UserTokenGrantIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/XFrameOptionsIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/XFrameOptionsIT.java index c7f23e4a09c..35d5f5468b3 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/XFrameOptionsIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/XFrameOptionsIT.java @@ -49,7 +49,7 @@ class XFrameOptionsIT { void logout_and_clear_cookies() { try { webDriver.get(baseUrl + "/logout.do"); - } catch (org.openqa.selenium.TimeoutException x) { + } catch (org.openqa.selenium.TimeoutException _) { //try again - this should not be happening - 20 second timeouts webDriver.get(baseUrl + "/logout.do"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ZoneValidationCookieHijackIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ZoneValidationCookieHijackIT.java index 31e6fc8cc45..f30c9586069 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ZoneValidationCookieHijackIT.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ZoneValidationCookieHijackIT.java @@ -113,8 +113,8 @@ void afterEach() { try { IntegrationTestUtils.deleteZone(baseUrl, zoneId, token); IntegrationTestUtils.deleteProvider(token, baseUrl, "uaa", zoneId + ".cloudfoundry-saml-login"); - } catch (Exception ignored) { - // ignored + } catch (Exception _) { + // ignore } } IntegrationTestUtils.deleteProvider(token, baseUrl, "uaa", SAML_ORIGIN); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/pageObjects/Page.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/pageObjects/Page.java index 47378c01319..26856665326 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/pageObjects/Page.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/pageObjects/Page.java @@ -77,7 +77,7 @@ public LoginPage assertThatLogout_goesToLoginPage(String baseUrl) { private LoginPage clickLogout(String baseUrl) { try { ((UaaWebDriver) driver).pressUaaNavigation("nav-dropdown-button", "nav-dropdown-content-logout"); - } catch (WebDriverException e) { + } catch (WebDriverException _) { driver.get(baseUrl + "/logout.do"); } // check that we end in /login diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java index f0da3a7fc65..2ac8c7c4648 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/IntegrationTestUtils.java @@ -241,7 +241,7 @@ public static boolean doesSupportZoneDNS() { Arrays.equals(Inet4Address.getByName("testzone4.localhost").getAddress(), new byte[]{127, 0, 0, 1}) && Arrays.equals(Inet4Address.getByName("testzonedoesnotexist.localhost").getAddress(), new byte[]{127, 0, 0, 1}) && Arrays.equals(Inet4Address.getByName("testzoneinactive.localhost").getAddress(), new byte[]{127, 0, 0, 1}); - } catch (UnknownHostException e) { + } catch (UnknownHostException _) { return false; } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/ScreenshotOnFailExtension.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/ScreenshotOnFailExtension.java index 8b145b5fa5e..1d8788e40b8 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/ScreenshotOnFailExtension.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/util/ScreenshotOnFailExtension.java @@ -40,7 +40,7 @@ public void afterTestExecution(ExtensionContext context) { File screenshotFile = getDestinationFile(className, description, "png"); try { FileUtils.copyFile(sourceScreenshotFile, screenshotFile); - } catch (IOException ioe) { + } catch (IOException _) { log.error("ScreenshotOnFail could not write image: {}", screenshotFile); return; } @@ -51,7 +51,7 @@ public void afterTestExecution(ExtensionContext context) { try { FileUtils.write(pageSourceFile, pageSource, StandardCharsets.UTF_8); - } catch (IOException e) { + } catch (IOException _) { log.error("ScreenshotOnFail could not write source: {}", pageSourceFile); return; } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java index e48d790e4b1..b829bbdb50b 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java @@ -1851,7 +1851,7 @@ void changeEmailSubmitWithSpringSecurityForcedCsrf() throws Exception { .andExpect(status().isFound()) .andExpect(redirectedUrl("email_sent?code=email_change")) .andReturn().getRequest().getSession(false); - System.out.println("session = " + session); + IO.println("session = " + session); } @Test diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java index b05367f8b4b..51443d50bdf 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/AbstractLdapMockMvcTest.java @@ -1142,7 +1142,7 @@ void transferDefaultMappingsToZone(IdentityZone zone) { group.setZoneId(zone.getId()); try { group = gp.create(group, IdentityZoneHolder.get().getId()); - } catch (ScimResourceAlreadyExistsException e) { + } catch (ScimResourceAlreadyExistsException _) { String filter = "displayName eq \"" + internalName + "\""; group = gp.query(filter, IdentityZoneHolder.get().getId()).getFirst(); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/LdapMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/LdapMockMvcTests.java index bdf566e7519..8910a2315b5 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/LdapMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/ldap/LdapMockMvcTests.java @@ -301,7 +301,7 @@ void unableToConnectToLdapWithInvalidSsl() { .andDo(print()) .andExpect(status().isBadRequest()) .andExpect(content().string(containsString("Caused by:"))); - } catch (Exception ignored) { + } catch (Exception _) { fail("should not be able to connect to LDAP server"); } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/providers/IdentityProviderEndpointsAliasMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/providers/IdentityProviderEndpointsAliasMockMvcTests.java index d87986d79a1..b8e522ed31b 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/providers/IdentityProviderEndpointsAliasMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/providers/IdentityProviderEndpointsAliasMockMvcTests.java @@ -1360,7 +1360,7 @@ private Optional> readIdpViaDb(final String id, final String final IdentityProvider idp; try { idp = identityProviderProvisioning.retrieve(id, zoneId); - } catch (final Exception e) { + } catch (final Exception _) { return Optional.empty(); } return Optional.of(idp); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/AbstractTokenMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/AbstractTokenMockMvcTests.java index 38fb5f97602..a227a5e931e 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/AbstractTokenMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/AbstractTokenMockMvcTests.java @@ -367,8 +367,8 @@ private static void addMember( ScimGroupMember gm = new ScimGroupMember(user.getId()); try { groupMembershipManager.addMember(group.getId(), gm, zoneId); - } catch (MemberAlreadyExistsException ignored) { - + } catch (MemberAlreadyExistsException _) { + // ignore } } @@ -390,7 +390,7 @@ protected void waitForClient(String clientId, int max) throws InterruptedExcepti try { clientDetailsService.loadClientByClientId(clientId); break; - } catch (NoSuchClientException e) { + } catch (NoSuchClientException _) { Thread.sleep(500); } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeDefaultConfigMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeDefaultConfigMockMvcTests.java index be2ccac0c41..0581d528041 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeDefaultConfigMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeDefaultConfigMockMvcTests.java @@ -59,29 +59,28 @@ void token_exchange_three_idps_using_id_token() throws Exception { .andExpect(jsonPath(".refresh_token").isNotEmpty()); Map tokens = JsonUtils.readValueAsMap(tokenExchangeResult.andReturn().getResponse().getContentAsString()); - assertThat(tokens.get(ISSUED_TOKEN_TYPE)).isEqualTo(TOKEN_TYPE_ACCESS); - assertThat(tokens.get(TOKEN_TYPE)).isEqualTo(BEARER_TYPE.toLowerCase()); + assertThat(tokens).containsEntry(ISSUED_TOKEN_TYPE, TOKEN_TYPE_ACCESS) + .containsEntry(TOKEN_TYPE, BEARER_TYPE.toLowerCase()); Jwt tokenClaims = JwtHelper.decode((String) tokens.get("id_token")); Map claims = JsonUtils.readValueAsMap(tokenClaims.getClaims()); - assertThat(claims.get("user_name")).isEqualTo(thirdParty.user().getUserName()); - assertThat(claims.get("email")).isEqualTo(thirdParty.user().getEmails().get(0).getValue()); - assertThat(claims.get("origin")).isEqualTo(workerServer.identityProvider().getOriginKey()); + assertThat(claims).containsEntry("user_name", thirdParty.user().getUserName()) + .containsEntry("email", thirdParty.user().getEmails().getFirst().getValue()) + .containsEntry("origin", workerServer.identityProvider().getOriginKey()); Map act = (Map) claims.get("act"); - assertThat(act).isNotNull(); assertThat(act).isNotEmpty(); Map controlServerClaims = JsonUtils.readValueAsMap( multiAuthSetup.getTokenClaims( - (String)multiAuthSetup.controlServerTokens().get("id_token"), - "id_token", - "controlServer" + (String) multiAuthSetup.controlServerTokens().get("id_token"), + "id_token", + "controlServer" ).getClaims() ); - assertThat(act.get("sub")).isEqualTo(controlServerClaims.get("sub")); - assertThat(act.get("iss")).isEqualTo(controlServerClaims.get("iss")); - assertThat(act.get("client_id")).isEqualTo(workerServer.client().getClientId()); + assertThat(act).containsEntry("sub", controlServerClaims.get("sub")) + .containsEntry("iss", controlServerClaims.get("iss")) + .containsEntry("client_id", workerServer.client().getClientId()); } @Test @@ -115,15 +114,15 @@ void token_exchange_three_idps_using_access_token() throws Exception { .andExpect(jsonPath(".access_token").isNotEmpty()); Map tokens = JsonUtils.readValueAsMap(tokenExchangeResult.andReturn().getResponse().getContentAsString()); - assertThat(tokens.get(ISSUED_TOKEN_TYPE)).isEqualTo(TOKEN_TYPE_ACCESS); - assertThat(tokens.get(TOKEN_TYPE)).isEqualTo(BEARER_TYPE.toLowerCase()); + assertThat(tokens).containsEntry(ISSUED_TOKEN_TYPE, TOKEN_TYPE_ACCESS) + .containsEntry(TOKEN_TYPE, BEARER_TYPE.toLowerCase()); Jwt tokenClaims = JwtHelper.decode((String) tokens.get("access_token")); Map claims = JsonUtils.readValueAsMap(tokenClaims.getClaims()); - assertThat(claims.get("user_name")).isEqualTo(thirdParty.user().getUserName()); - assertThat(claims.get("email")).isEqualTo(thirdParty.user().getEmails().get(0).getValue()); - assertThat(claims.get("origin")).isEqualTo(workerServer.identityProvider().getOriginKey()); + assertThat(claims).containsEntry("user_name", thirdParty.user().getUserName()) + .containsEntry("email", thirdParty.user().getEmails().getFirst().getValue()) + .containsEntry("origin", workerServer.identityProvider().getOriginKey()); } @Test @@ -159,23 +158,23 @@ void token_exchange_three_idps_using_client_assertion() throws Exception { .andExpect(jsonPath(".refresh_token").isNotEmpty()); Map tokens = JsonUtils.readValueAsMap(tokenExchangeResult.andReturn().getResponse().getContentAsString()); - assertThat(tokens.get(ISSUED_TOKEN_TYPE)).isEqualTo(TOKEN_TYPE_ACCESS); - assertThat(tokens.get(TOKEN_TYPE)).isEqualTo(BEARER_TYPE.toLowerCase()); + assertThat(tokens).containsEntry(ISSUED_TOKEN_TYPE, TOKEN_TYPE_ACCESS) + .containsEntry(TOKEN_TYPE, BEARER_TYPE.toLowerCase()); Jwt tokenClaims = JwtHelper.decode((String) tokens.get("access_token")); Map claims = JsonUtils.readValueAsMap(tokenClaims.getClaims()); - assertThat(claims.get("user_name")).isEqualTo(thirdParty.user().getUserName()); - assertThat(claims.get("email")).isEqualTo(thirdParty.user().getEmails().get(0).getValue()); - assertThat(claims.get("origin")).isEqualTo(workerServer.identityProvider().getOriginKey()); + assertThat(claims).containsEntry("user_name", thirdParty.user().getUserName()) + .containsEntry("email", thirdParty.user().getEmails().getFirst().getValue()) + .containsEntry("origin", workerServer.identityProvider().getOriginKey()); Map subjectTokenClaims = JsonUtils.readValueAsMap(JwtHelper.decode(idToken).getClaims()); Map actClaim = (Map) claims.get(ClaimConstants.ACT); - assertThat(actClaim.get(ClaimConstants.CLIENT_ID)).isEqualTo(workerServer.client().getClientId()); - assertThat(actClaim.get(ClaimConstants.SUB)).isEqualTo(subjectTokenClaims.get(ClaimConstants.SUB)); - assertThat(actClaim.get(ClaimConstants.USER_NAME)).isEqualTo(subjectTokenClaims.get(ClaimConstants.USER_NAME)); - assertThat(actClaim.get(ClaimConstants.USER_ID)).isEqualTo(subjectTokenClaims.get(ClaimConstants.USER_ID)); - assertThat(actClaim.get(ClaimConstants.ORIGIN)).isEqualTo(subjectTokenClaims.get(ClaimConstants.ORIGIN)); + assertThat(actClaim).containsEntry(ClaimConstants.CLIENT_ID, workerServer.client().getClientId()) + .containsEntry(ClaimConstants.SUB, subjectTokenClaims.get(ClaimConstants.SUB)) + .containsEntry(ClaimConstants.USER_NAME, subjectTokenClaims.get(ClaimConstants.USER_NAME)) + .containsEntry(ClaimConstants.USER_ID, subjectTokenClaims.get(ClaimConstants.USER_ID)) + .containsEntry(ClaimConstants.ORIGIN, subjectTokenClaims.get(ClaimConstants.ORIGIN)); } @Test @@ -200,7 +199,7 @@ void token_exchange_impersonate_client() throws Exception { ); //update the worker server client to have `token_exchange.impersonate. authority - String requiredImpersonationAuthority = String.format(TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION, audience.getClientId()); + String requiredImpersonationAuthority = TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION.formatted(audience.getClientId()); UaaClientDetails workerClient = (UaaClientDetails) workerServer.client(); workerClient.setAuthorities(List.of(new SimpleGrantedAuthority(requiredImpersonationAuthority))); webApplicationContext.getBean(MultitenantJdbcClientDetailsService.class).updateClientDetails( @@ -233,20 +232,19 @@ void token_exchange_impersonate_client() throws Exception { Jwt tokenClaims = JwtHelper.decode((String) tokens.get("access_token")); Map claims = JsonUtils.readValueAsMap(tokenClaims.getClaims()); - assertThat(claims.get("user_name")).isEqualTo(thirdParty.user().getUserName()); - assertThat(claims.get("email")).isEqualTo(thirdParty.user().getEmails().get(0).getValue()); - assertThat(claims.get("origin")).isEqualTo(workerServer.identityProvider().getOriginKey()); - assertThat(claims.get("client_id")).isEqualTo(audience.getClientId()); - assertThat(claims.get("cid")).isEqualTo(audience.getClientId()); + assertThat(claims).containsEntry("user_name", thirdParty.user().getUserName()) + .containsEntry("email", thirdParty.user().getEmails().getFirst().getValue()) + .containsEntry("origin", workerServer.identityProvider().getOriginKey()) + .containsEntry("client_id", audience.getClientId()) + .containsEntry("cid", audience.getClientId()); Map subjectTokenClaims = JsonUtils.readValueAsMap(JwtHelper.decode(accessToken).getClaims()); Map actClaim = (Map) claims.get(ClaimConstants.ACT); - assertThat(actClaim.get(ClaimConstants.CLIENT_ID)).isEqualTo(workerServer.client().getClientId()); - assertThat(actClaim.get(ClaimConstants.SUB)).isEqualTo(subjectTokenClaims.get(ClaimConstants.SUB)); - assertThat(actClaim.get(ClaimConstants.USER_NAME)).isEqualTo(subjectTokenClaims.get(ClaimConstants.USER_NAME)); - assertThat(actClaim.get(ClaimConstants.USER_ID)).isEqualTo(subjectTokenClaims.get(ClaimConstants.USER_ID)); - assertThat(actClaim.get(ClaimConstants.ORIGIN)).isEqualTo(subjectTokenClaims.get(ClaimConstants.ORIGIN)); - + assertThat(actClaim).containsEntry(ClaimConstants.CLIENT_ID, workerServer.client().getClientId()) + .containsEntry(ClaimConstants.SUB, subjectTokenClaims.get(ClaimConstants.SUB)) + .containsEntry(ClaimConstants.USER_NAME, subjectTokenClaims.get(ClaimConstants.USER_NAME)) + .containsEntry(ClaimConstants.USER_ID, subjectTokenClaims.get(ClaimConstants.USER_ID)) + .containsEntry(ClaimConstants.ORIGIN, subjectTokenClaims.get(ClaimConstants.ORIGIN)); } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeGrantEndpointDocs.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeGrantEndpointDocs.java index c2b4ebb6a09..dc06538f10a 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeGrantEndpointDocs.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeGrantEndpointDocs.java @@ -57,7 +57,7 @@ class TokenExchangeGrantEndpointDocs extends TokenExchangeMockMvcBase { ParameterDescriptor p_client_secret = parameterWithName("client_secret").type(STRING).optional().description("The [secret passphrase configured](#change-secret) for the OAuth client. Optional if it is passed as part of the Basic Authorization header or if client_assertion is sent as part of private_key_jwt authentication."); ParameterDescriptor p_client_assertion = parameterWithName("client_assertion").type(STRING).optional(null).description("NOT YET SUPPORTED! UAA 76.23.0 Client authentication using method [private_key_jwt](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication). Optional as replacement of methods client_secret_basic or client_secret_post using secrets. The client needs to have a valid [JWT confiuration](#change-client-jwt) for trust to JWT in client_assertion."); ParameterDescriptor p_client_assertion_type = parameterWithName("client_assertion_type").type(STRING).optional(null).description("NOT YET SUPPORTED!UAA 76.23.0 [RFC 7523](https://tools.ietf.org/html/rfc7523) describes the type. Must be set to `urn:ietf:params:oauth:client-assertion-type:jwt-bearer` if `client_assertion` parameter is present."); - ParameterDescriptor p_audience = parameterWithName("audience").type(STRING).optional(null).description("Valid client_id used to impersonate/swap the identity of the calling client in the resulting token. [RFC 8693](https://www.rfc-editor.org/rfc/rfc8693.html#name-request). Note: The calling client must have `"+String.format(TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION, "")+"` as an an authority (client.authorities). For example `"+String.format(TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION, "cf")+"` to be allowed to impersonate the `cf` client."); + ParameterDescriptor p_audience = parameterWithName("audience").type(STRING).optional(null).description("Valid client_id used to impersonate/swap the identity of the calling client in the resulting token. [RFC 8693](https://www.rfc-editor.org/rfc/rfc8693.html#name-request). Note: The calling client must have `"+TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION.formatted("")+"` as an an authority (client.authorities). For example `"+TOKEN_EXCHANGE_IMPERSONATE_CLIENT_PERMISSION.formatted("cf")+"` to be allowed to impersonate the `cf` client."); ParameterDescriptor p_subject_token = parameterWithName("subject_token").type(STRING).required().description("Must be a valid JWT token representing the identity to be assumed in the resulting token. [RFC 8693](https://www.rfc-editor.org/rfc/rfc8693.html#name-request)"); ParameterDescriptor p_subject_token_type = parameterWithName("subject_token_type").type(STRING).required().description("Must be " + TOKEN_TYPE_ACCESS + " or " + TOKEN_TYPE_ID + ". [RFC 8693](https://www.rfc-editor.org/rfc/rfc8693.html#name-request)"); ParameterDescriptor p_requested_token_type = parameterWithName("requested_token_type").type(STRING).optional().description("Must be " + TOKEN_TYPE_ACCESS + ". [RFC 8693](https://www.rfc-editor.org/rfc/rfc8693.html#name-request)"); @@ -67,7 +67,6 @@ class TokenExchangeGrantEndpointDocs extends TokenExchangeMockMvcBase { ParameterDescriptor p_response_type = parameterWithName("response_type").type(STRING).optional(null).description("May be set to `token` or `token id_token`. The latter produces an access_token and an id_token if the scope `openid` is present and approved"); ParameterDescriptor p_token_format = parameterWithName("token_format").type(STRING).optional(null).description("May be set to `opaque` to retrieve revocable and non identifiable access token"); - @BeforeEach void setUpContext(ManualRestDocumentation manualRestDocumentation) { mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext) diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeMockMvcBase.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeMockMvcBase.java index 1971590f27b..7c90ef22231 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeMockMvcBase.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeMockMvcBase.java @@ -123,15 +123,14 @@ public AuthorizationServer workerServer() { public Jwt getTokenClaims(String token, String tokenKey, String serverKey) { assertThat(token) - .withFailMessage(String.format("Server: %s does not have a token under key: %s", serverKey, tokenKey)) - .isNotNull() + .withFailMessage("Server: %s does not have a token under key: %s".formatted(serverKey, tokenKey)) .isNotEmpty(); try { return JwtHelper.decode(token); - } catch (RuntimeException e) { + } catch (RuntimeException _) { Assertions.fail( - String.format("Unable to decode token: %s for server: %s and key: %s", token, serverKey, tokenKey) + "Unable to decode token: %s for server: %s and key: %s".formatted(token, serverKey, tokenKey) ); } return null; @@ -142,7 +141,7 @@ ThreeWayUAASetup getThreeWayUaaSetUp() throws Exception { //simulate an outside IDP AuthorizationServer thirdParty = getAuthorizationServer( "3rd", - provider -> null, + _ -> null, (client) -> { client.setScope(List.of("openid")); client.setAuthorizedGrantTypes(List.of("password", "refresh_token")); @@ -169,7 +168,7 @@ ThreeWayUAASetup getThreeWayUaaSetUp() throws Exception { client.setAutoApproveScopes(List.of("openid")); return client; }, - user -> null + _ -> null ); //create foundation UAA @@ -195,7 +194,7 @@ ThreeWayUAASetup getThreeWayUaaSetUp() throws Exception { client.setAutoApproveScopes(List.of("openid")); return client; }, - user -> null + _ -> null ); //get an id_token from third party UAA @@ -225,7 +224,6 @@ ThreeWayUAASetup getThreeWayUaaSetUp() throws Exception { (String) thirdPartyTokens.get("id_token") ); - return new ThreeWayUAASetup(thirdParty, thirdPartyTokens, controlServer, hubTokens, workerServer); } @@ -394,11 +392,10 @@ String getClientAssertion(IdentityZone zone, String issuer, UaaClientDetails cli claims.setJti(UUID.randomUUID().toString().replace("-", "")); claims.setIat((int) Instant.now().minusSeconds(120).getEpochSecond()); claims.setExp(Instant.now().plusSeconds(300).getEpochSecond()); - JsonWebKey jsonWebKey = clientJwtConfiguration.getJwkSet().getKeys().get(0); + JsonWebKey jsonWebKey = clientJwtConfiguration.getJwkSet().getKeys().getFirst(); KeyInfo signingKeyInfo = getPrivateKey(issuer); return signingKeyInfo.verifierCertificate().isPresent() ? JwtHelper.encodePlusX5t(claims.getClaimMap(), signingKeyInfo, signingKeyInfo.verifierCertificate().orElseThrow()).getEncoded() : JwtHelper.encode(claims.getClaimMap(), signingKeyInfo).getEncoded(); - } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeOverrideAuthManagerMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeOverrideAuthManagerMockMvcTests.java index 4e2a85c7485..9944f6af236 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeOverrideAuthManagerMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenExchangeOverrideAuthManagerMockMvcTests.java @@ -138,9 +138,9 @@ void token_exchange_modify_origin_based_on_bean_override() throws Exception { Jwt tokenClaims = JwtHelper.decode((String) tokens.get("access_token")); Map claims = JsonUtils.readValueAsMap(tokenClaims.getClaims()); - assertThat(claims.get("user_name")).isEqualTo(thirdParty.user().getUserName()); - assertThat(claims.get("email")).isEqualTo(thirdParty.user().getEmails().get(0).getValue()); - assertThat(claims.get("origin")).isEqualTo("override-origin"); + assertThat(claims).containsEntry("user_name", thirdParty.user().getUserName()) + .containsEntry("email", thirdParty.user().getEmails().getFirst().getValue()) + .containsEntry("origin", "override-origin"); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenRevocationEndpointMockMvcTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenRevocationEndpointMockMvcTest.java index 96593d8bc67..4307273d4e1 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenRevocationEndpointMockMvcTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenRevocationEndpointMockMvcTest.java @@ -86,7 +86,8 @@ void revokeOwnJWToken() throws Exception { assertThat(tokenRevocationEvent.getAuditEvent().getOrigin()).contains(client.getClientId()); revocableTokenProvisioning.retrieve(jti, IdentityZoneHolder.get().getId()); fail("Expected EmptyResultDataAccessException to be thrown for revoked token"); - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { + // ignore } finally { defaultZone.getConfig().getTokenPolicy().setJwtRevocable(false); identityZoneProvisioning.update(defaultZone); @@ -201,8 +202,8 @@ void revokeOtherClientTokenByClientId(String scope) throws Exception { try { revocableTokenProvisioning.retrieve(tokenToBeRevoked, IdentityZoneHolder.get().getId()); fail("Token should have been deleted"); - } catch (EmptyResultDataAccessException e) { - //expected + } catch (EmptyResultDataAccessException _) { + // expected } } @@ -263,7 +264,8 @@ void revokeOpaqueTokenWithOpaqueToken() throws Exception { try { revocableTokenProvisioning.retrieve(opaqueUserToken, IdentityZoneHolder.get().getId()); - } catch (EmptyResultDataAccessException ignored) { + } catch (EmptyResultDataAccessException _) { + // ignore } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/JwtTokenUtils.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/JwtTokenUtils.java index f1a0890c06a..2cece9e6d7d 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/JwtTokenUtils.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/JwtTokenUtils.java @@ -16,7 +16,7 @@ public static Map getClaimsForToken(String token) { Jwt tokenJwt; try { tokenJwt = JwtHelper.decode(token); - } catch (Throwable t) { + } catch (Throwable _) { throw new InvalidTokenException("Invalid token (could not decode): " + token); } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java index 2e91c351352..857de21b391 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java @@ -571,7 +571,7 @@ public static IdentityProvider createIdpUsingWebRequest(MockMvc mockMvc, String if (hasText(result.getResponse().getContentAsString())) { try { return JsonUtils.readValue(result.getResponse().getContentAsString(), IdentityProvider.class); - } catch (JsonUtils.JsonUtilException e) { + } catch (JsonUtils.JsonUtilException _) { return null; } } else { diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServicesTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServicesTests.java index 4f29712fe1b..dd9efa33505 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServicesTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServicesTests.java @@ -650,10 +650,10 @@ private boolean waitForClient(String clientId, int max) { try { jdbcClientDetailsService.loadClientByClientId(clientId); return true; - } catch (NoSuchClientException e) { + } catch (NoSuchClientException _) { try { Thread.sleep(500); - } catch (InterruptedException interruptedException) { + } catch (InterruptedException _) { return false; } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/performance/LoginPagePerformanceMockMvcTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/performance/LoginPagePerformanceMockMvcTest.java index 6754ac1aa33..4cc325675e7 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/performance/LoginPagePerformanceMockMvcTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/performance/LoginPagePerformanceMockMvcTest.java @@ -133,7 +133,7 @@ void idpDiscoveryRedirectsToOIDCProvider( stopWatch.stop(); long totalTimeMillis = stopWatch.getTotalTimeMillis(); - System.out.println(totalTimeMillis + "ms"); + IO.println(totalTimeMillis + "ms"); } private static String createOIDCProvider(JdbcIdentityProviderProvisioning jdbcIdentityProviderProvisioning, AlphanumericRandomValueStringGenerator generator, IdentityZone zone, String responseType, String domain) throws Exception { diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsMockMvcTests.java index 448258b74ef..1328cedbcb1 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsMockMvcTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsMockMvcTests.java @@ -1391,7 +1391,8 @@ private ScimUser createUserAndAddToGroups(IdentityZone zone, Set groupNa ScimGroupMember member = new ScimGroupMember(user.getId(), ScimGroupMember.Type.USER); try { scimGroupMembershipManager.addMember(group.getId(), member, IdentityZoneHolder.get().getId()); - } catch (MemberAlreadyExistsException ignored) { + } catch (MemberAlreadyExistsException _) { + // ignore } } } finally { @@ -1432,7 +1433,8 @@ private ScimGroup createGroupWithinGroups(IdentityZone zone, Set groupNa ScimGroupMember member = new ScimGroupMember(newGroup.getId(), ScimGroupMember.Type.GROUP); try { scimGroupMembershipManager.addMember(group.getId(), member, IdentityZoneHolder.get().getId()); - } catch (MemberAlreadyExistsException ignored) { + } catch (MemberAlreadyExistsException _) { + // ignore } } } finally { diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsTests.java index 3eb531fc8a9..8ac0a10f971 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsTests.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimGroupEndpointsTests.java @@ -551,7 +551,7 @@ void updateWithInvalidMemberFails() { try { scimGroupEndpoints.updateGroup(g1, g1.getId(), "*", new MockHttpServletResponse()); fail("must have thrown exception"); - } catch (ScimException ex) { + } catch (ScimException _) { // ensure that displayName was not updated g1 = scimGroupEndpoints.getGroup(g1.getId(), new MockHttpServletResponse()); validateGroup(g1, "clients.read", 0); @@ -620,7 +620,7 @@ void updateWrongVersionFails() { try { scimGroupEndpoints.updateGroup(g1, g1.getId(), String.valueOf(g1.getVersion() + 23), new MockHttpServletResponse()); - } catch (ScimException ex) { + } catch (ScimException _) { validateSearchResults(scimGroupEndpoints.listGroups("id", "displayName eq \"clients.write\"", "id", "ASC", 1, 100), 0); validateSearchResults(scimGroupEndpoints.listGroups("id", "displayName eq \"clients.read\"", "id", "ASC", 1, 100), 1); } @@ -683,7 +683,7 @@ void deleteWrongVersionFails() { try { scimGroupEndpoints.deleteGroup(g.getId(), String.valueOf(g.getVersion() + 3), new MockHttpServletResponse()); - } catch (ScimException ex) { + } catch (ScimException _) { validateSearchResults(scimGroupEndpoints.listGroups("id", "displayName eq \"clients.read\"", "id", "ASC", 1, 100), 1); } deleteGroup("clients.read"); diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/InMemoryLdapServer.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/InMemoryLdapServer.java index 9dad8b92d5a..f8f8580c26f 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/InMemoryLdapServer.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/InMemoryLdapServer.java @@ -116,7 +116,7 @@ public void stop() { public boolean isRunning() { try { return this.directoryServer.getConnection().isConnected(); - } catch (LDAPException e) { + } catch (LDAPException _) { return false; } } diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/UaaWebDriver.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/UaaWebDriver.java index 4c29f868b55..8a47ac2ae5c 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/UaaWebDriver.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/test/UaaWebDriver.java @@ -50,11 +50,11 @@ public void clickAndWait(By locator) { new FluentWait<>(this.delegate).withTimeout(WAIT_TIMEOUT) .pollingEvery(POLLING_TIME) .withMessage(() -> "Waiting for navigation after clicking on [%s]. Current URL [%s].".formatted(locator, delegate.getCurrentUrl())) - .until((d) -> { + .until((_) -> { try { clickableElement.isDisplayed(); return false; - } catch (StaleElementReferenceException e) { + } catch (StaleElementReferenceException _) { return true; } catch (WebDriverException e) { return e.getMessage().contains("-32000"); @@ -158,7 +158,7 @@ public SessionId getSessionId() { } try { return ((RemoteWebDriver) this.delegate).getSessionId(); - } catch (Exception e) { + } catch (Exception _) { // If the WebDriver has been quit or closed, getSessionId() may throw an exception // Return null to indicate the session is no longer available return null; diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/yml/YamlProcessorTest.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/yml/YamlProcessorTest.java index 93d46c37f59..c933a59858b 100644 --- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/yml/YamlProcessorTest.java +++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/yml/YamlProcessorTest.java @@ -27,7 +27,7 @@ void loadAll_yamlIsFullOfLongComments_yamlLoadsInUnderASecond() { Iterable objects = yaml.loadAll(inputStream); for (Object o : objects) { - System.out.println(o); + IO.println(o); } }); }