Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polish diamond operator #1848

Closed
wants to merge 1 commit into from
Closed

Polish diamond operator #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ protected final ObjectMapper getObjectMapper() {

private Map<String, Object> parseMap(String data) {
try {
return this.objectMapper.readValue(data, new TypeReference<Map<String, Object>>() {
return this.objectMapper.readValue(data, new TypeReference<>() {
});
}
catch (Exception ex) {
Expand Down
2 changes: 1 addition & 1 deletion ...framework/security/oauth2/server/authorization/client/JdbcRegisteredClientRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ protected final ObjectMapper getObjectMapper() {

private Map<String, Object> parseMap(String data) {
try {
return this.objectMapper.readValue(data, new TypeReference<Map<String, Object>>() {
return this.objectMapper.readValue(data, new TypeReference<>() {
});
}
catch (Exception ex) {
Expand Down
4 changes: 2 additions & 2 deletions ...r/authorization/http/converter/OAuth2AuthorizationServerMetadataHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -49,7 +49,7 @@
public class OAuth2AuthorizationServerMetadataHttpMessageConverter
extends AbstractHttpMessageConverter<OAuth2AuthorizationServerMetadata> {

private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<Map<String, Object>>() {
private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<>() {
};

private final GenericHttpMessageConverter<Object> jsonMessageConverter = HttpMessageConverters
Expand Down
4 changes: 2 additions & 2 deletions ...th2/server/authorization/http/converter/OAuth2TokenIntrospectionHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2022 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -58,7 +58,7 @@
public class OAuth2TokenIntrospectionHttpMessageConverter
extends AbstractHttpMessageConverter<OAuth2TokenIntrospection> {

private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<Map<String, Object>>() {
private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<>() {
};

private final GenericHttpMessageConverter<Object> jsonMessageConverter = HttpMessageConverters
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/springframework/security/oauth2/server/authorization/jackson2/JsonNodeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2022 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,10 +30,10 @@
*/
abstract class JsonNodeUtils {

static final TypeReference<Set<String>> STRING_SET = new TypeReference<Set<String>>() {
static final TypeReference<Set<String>> STRING_SET = new TypeReference<>() {
};

static final TypeReference<Map<String, Object>> STRING_OBJECT_MAP = new TypeReference<Map<String, Object>>() {
static final TypeReference<Map<String, Object>> STRING_OBJECT_MAP = new TypeReference<>() {
};

static String findStringValue(JsonNode jsonNode, String fieldName) {
Expand Down
4 changes: 2 additions & 2 deletions .../server/authorization/oidc/http/converter/OidcClientRegistrationHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -56,7 +56,7 @@
*/
public class OidcClientRegistrationHttpMessageConverter extends AbstractHttpMessageConverter<OidcClientRegistration> {

private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<Map<String, Object>>() {
private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<>() {
};

private final GenericHttpMessageConverter<Object> jsonMessageConverter = HttpMessageConverters
Expand Down
4 changes: 2 additions & 2 deletions ...rver/authorization/oidc/http/converter/OidcProviderConfigurationHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2022 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -49,7 +49,7 @@
public class OidcProviderConfigurationHttpMessageConverter
extends AbstractHttpMessageConverter<OidcProviderConfiguration> {

private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<Map<String, Object>>() {
private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<>() {
};

private final GenericHttpMessageConverter<Object> jsonMessageConverter = HttpMessageConverters
Expand Down
4 changes: 2 additions & 2 deletions ...ity/oauth2/server/authorization/oidc/http/converter/OidcUserInfoHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2022 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -48,7 +48,7 @@
*/
public class OidcUserInfoHttpMessageConverter extends AbstractHttpMessageConverter<OidcUserInfo> {

private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<Map<String, Object>>() {
private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<>() {
};

private final GenericHttpMessageConverter<Object> jsonMessageConverter = HttpMessageConverters
Expand Down
4 changes: 2 additions & 2 deletions ...ngframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -756,7 +756,7 @@ public OAuth2Authorization mapRow(ResultSet rs, int rowNum) throws SQLException

private Map<String, Object> parseMap(String data) {
try {
return getObjectMapper().readValue(data, new TypeReference<Map<String, Object>>() {
return getObjectMapper().readValue(data, new TypeReference<>() {
});
}
catch (Exception ex) {
Expand Down
2 changes: 1 addition & 1 deletion ...work/security/oauth2/server/authorization/client/JdbcRegisteredClientRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public RegisteredClient mapRow(ResultSet rs, int rowNum) throws SQLException {

private Map<String, Object> parseMap(String data) {
try {
return this.objectMapper.readValue(data, new TypeReference<Map<String, Object>>() {
return this.objectMapper.readValue(data, new TypeReference<>() {
});
}
catch (Exception ex) {
Expand Down
6 changes: 3 additions & 3 deletions ...ty/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2ModuleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
*/
public class OAuth2AuthorizationServerJackson2ModuleTests {

private static final TypeReference<Map<String, Object>> STRING_OBJECT_MAP = new TypeReference<Map<String, Object>>() {
private static final TypeReference<Map<String, Object>> STRING_OBJECT_MAP = new TypeReference<>() {
};

private static final TypeReference<Set<String>> STRING_SET = new TypeReference<Set<String>>() {
private static final TypeReference<Set<String>> STRING_SET = new TypeReference<>() {
};

private static final TypeReference<String[]> STRING_ARRAY = new TypeReference<String[]>() {
private static final TypeReference<String[]> STRING_ARRAY = new TypeReference<>() {
};

private ObjectMapper objectMapper;
Expand Down
Loading