From 2b94aff58ec770244ab3fb8b420d8a5db99c76f1 Mon Sep 17 00:00:00 2001 From: Dominik Frantisek Bucik Date: Mon, 15 Nov 2021 10:10:46 +0100 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Code=20inspection=20?= =?UTF-8?q?by=20IDEA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ClientKeyCacheService.java | 8 ++-- .../convert/JsonElementStringConverter.java | 2 +- .../service/ClientDetailsEntityService.java | 16 +++---- .../impl/DefaultClientUserDetailsService.java | 2 +- .../impl/DefaultDeviceCodeService.java | 2 +- ...DefaultOAuth2AuthorizationCodeService.java | 2 +- ...faultOAuth2ClientDetailsEntityService.java | 10 ++-- .../impl/DefaultSystemScopeService.java | 10 ++-- .../UriEncodedClientUserDetailsService.java | 2 +- .../ics/oauth2/token/ChainedTokenGranter.java | 2 +- .../cz/muni/ics/oauth2/view/TokenApiView.java | 7 +-- .../web/OAuthConfirmationController.java | 2 +- .../java/cz/muni/ics/oauth2/web/ScopeAPI.java | 2 +- .../models/PerunAttributeValueAwareModel.java | 2 +- ...PerunSamlAuthenticationSuccessHandler.java | 2 +- .../oidc/server/elixir/GA4GHClaimSource.java | 6 +-- .../server/filters/PerunFiltersContext.java | 6 +-- .../filters/PerunRequestFilterParams.java | 8 ++-- .../cz/muni/ics/oidc/web/WebHtmlClasses.java | 2 +- .../ClientDetailsEntityJsonProcessor.java | 2 +- .../JWTBearerAuthenticationProvider.java | 2 +- ...rerClientAssertionTokenEndpointFilter.java | 4 +- .../ConfigurationBeanLocaleResolver.java | 2 +- .../connect/config/JsonMessageSource.java | 7 +-- .../connect/config/ServerConfiguration.java | 13 ++---- .../openid/connect/model/DefaultAddress.java | 9 +--- .../openid/connect/model/DefaultUserInfo.java | 9 +--- .../convert/JsonObjectStringConverter.java | 2 +- .../request/ConnectOAuth2RequestFactory.java | 6 +-- .../request/ConnectRequestParameters.java | 46 +++++++++---------- .../impl/DefaultApprovedSiteService.java | 2 +- .../DefaultScopeClaimTranslationService.java | 2 +- .../view/AbstractClientEntityView.java | 4 +- .../view/ClientEntityViewForAdmins.java | 13 ++---- .../view/ClientEntityViewForUsers.java | 13 ++---- .../view/ClientInformationResponseView.java | 2 +- .../connect/view/JsonApprovedSiteView.java | 7 +-- .../openid/connect/view/JsonEntityView.java | 7 +-- .../openid/connect/view/JsonErrorView.java | 7 +-- .../ics/openid/connect/view/UserInfoView.java | 7 +-- .../web/AuthenticationTimeStamper.java | 2 +- .../ics/openid/connect/web/BlacklistAPI.java | 4 +- .../ics/openid/connect/web/ClientAPI.java | 4 +- .../connect/web/UserInfoInterceptor.java | 4 +- .../ics/openid/connect/web/WhitelistAPI.java | 4 +- .../java/cz/muni/ics/uma/model/Claim.java | 9 +--- .../java/cz/muni/ics/uma/model/Policy.java | 9 +--- .../cz/muni/ics/uma/model/ResourceSet.java | 9 +--- .../main/java/cz/muni/ics/util/JsonUtils.java | 2 +- .../AbstractPageOperationTemplateTest.java | 4 +- .../util/TestWebfingerURLNormalizer.java | 2 +- .../cz/muni/ics/jose/TestJWKSetKeyStore.java | 20 ++++---- ...aultJWTEncryptionAndDecryptionService.java | 30 ++++++------ .../TestBlacklistAwareRedirectResolver.java | 6 +-- ...stDefaultIntrospectionResultAssembler.java | 4 +- ...TestDefaultOAuth2ProviderTokenService.java | 10 ++-- .../impl/TestDefaultSystemScopeService.java | 12 ++--- .../TestJWTBearerAuthenticationProvider.java | 6 +-- .../connect/config/TestJsonMessageSource.java | 4 +- .../TestDefaultBlacklistedSiteService.java | 6 +-- .../impl/TestDefaultOIDCTokenService.java | 8 ++-- .../impl/TestDefaultUserInfoService.java | 32 ++++++------- .../TestUUIDPairwiseIdentiferService.java | 36 +++++++-------- .../token/TestConnectTokenEnhancer.java | 4 +- 64 files changed, 216 insertions(+), 274 deletions(-) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/jwt/signer/service/impl/ClientKeyCacheService.java b/perun-oidc-server/src/main/java/cz/muni/ics/jwt/signer/service/impl/ClientKeyCacheService.java index 0179a2e24..3f9ab0efa 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/jwt/signer/service/impl/ClientKeyCacheService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/jwt/signer/service/impl/ClientKeyCacheService.java @@ -48,10 +48,10 @@ import org.springframework.util.StringUtils; @Slf4j public class ClientKeyCacheService { - private JWKSetCacheService jwksUriCache; - private SymmetricKeyJWTValidatorCacheService symmetricCache; - private LoadingCache jwksValidators; - private LoadingCache jwksEncrypters; + private final JWKSetCacheService jwksUriCache; + private final SymmetricKeyJWTValidatorCacheService symmetricCache; + private final LoadingCache jwksValidators; + private final LoadingCache jwksEncrypters; @Autowired public ClientKeyCacheService(JWKSetCacheService jwksUriCache, SymmetricKeyJWTValidatorCacheService symmetricCache) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/convert/JsonElementStringConverter.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/convert/JsonElementStringConverter.java index 86ceb18eb..b2228ea2c 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/convert/JsonElementStringConverter.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/convert/JsonElementStringConverter.java @@ -28,7 +28,7 @@ import org.springframework.util.StringUtils; @Converter public class JsonElementStringConverter implements AttributeConverter { - private JsonParser parser = new JsonParser(); + private final JsonParser parser = new JsonParser(); @Override public String convertToDatabaseColumn(JsonElement attribute) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/ClientDetailsEntityService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/ClientDetailsEntityService.java index fc7a6b174..c08e30d21 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/ClientDetailsEntityService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/ClientDetailsEntityService.java @@ -24,21 +24,21 @@ import org.springframework.security.oauth2.provider.ClientDetailsService; public interface ClientDetailsEntityService extends ClientDetailsService { - public ClientDetailsEntity saveNewClient(ClientDetailsEntity client); + ClientDetailsEntity saveNewClient(ClientDetailsEntity client); - public ClientDetailsEntity getClientById(Long id); + ClientDetailsEntity getClientById(Long id); @Override - public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception; + ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception; - public void deleteClient(ClientDetailsEntity client); + void deleteClient(ClientDetailsEntity client); - public ClientDetailsEntity updateClient(ClientDetailsEntity oldClient, ClientDetailsEntity newClient); + ClientDetailsEntity updateClient(ClientDetailsEntity oldClient, ClientDetailsEntity newClient); - public Collection getAllClients(); + Collection getAllClients(); - public ClientDetailsEntity generateClientId(ClientDetailsEntity client); + ClientDetailsEntity generateClientId(ClientDetailsEntity client); - public ClientDetailsEntity generateClientSecret(ClientDetailsEntity client); + ClientDetailsEntity generateClientSecret(ClientDetailsEntity client); } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultClientUserDetailsService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultClientUserDetailsService.java index 4a06f2c0e..b029d4d63 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultClientUserDetailsService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultClientUserDetailsService.java @@ -38,7 +38,7 @@ import org.springframework.stereotype.Service; @Service("clientUserDetailsService") public class DefaultClientUserDetailsService implements UserDetailsService { - private static GrantedAuthority ROLE_CLIENT = new SimpleGrantedAuthority("ROLE_CLIENT"); + private static final GrantedAuthority ROLE_CLIENT = new SimpleGrantedAuthority("ROLE_CLIENT"); private ClientDetailsEntityService clientDetailsService; private final ConfigurationPropertiesBean config; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultDeviceCodeService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultDeviceCodeService.java index bbfbe8bcb..a1b7d8fa1 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultDeviceCodeService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultDeviceCodeService.java @@ -44,7 +44,7 @@ public class DefaultDeviceCodeService implements DeviceCodeService { @Autowired private DeviceCodeRepository repository; - private RandomValueStringGenerator randomGenerator = new RandomValueStringGenerator(); + private final RandomValueStringGenerator randomGenerator = new RandomValueStringGenerator(); /* (non-Javadoc) * @see cz.muni.ics.oauth2.service.DeviceCodeService#save(cz.muni.ics.oauth2.model.DeviceCode) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java index b5c0dbc7d..ff76030df 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java @@ -54,7 +54,7 @@ public class DefaultOAuth2AuthorizationCodeService implements AuthorizationCodeS private int authCodeExpirationSeconds = 60 * 5; // expire in 5 minutes by default - private RandomValueStringGenerator generator = new RandomValueStringGenerator(22); + private final RandomValueStringGenerator generator = new RandomValueStringGenerator(22); /** * Generate a random authorization code and create an AuthorizationCodeEntity, diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java index 92e1a9fab..8c24faa0d 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java @@ -90,7 +90,7 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt private ConfigurationPropertiesBean config; // map of sector URI -> list of redirect URIs - private LoadingCache> sectorRedirects = CacheBuilder.newBuilder() + private final LoadingCache> sectorRedirects = CacheBuilder.newBuilder() .expireAfterAccess(1, TimeUnit.HOURS) .maximumSize(100) .build(new SectorIdentifierLoader(HttpClientBuilder.create().useSystemProperties().build())); @@ -318,7 +318,7 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt * Get the client for the given ClientID */ @Override - public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception, InvalidClientException, IllegalArgumentException { + public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception, IllegalArgumentException { if (!Strings.isNullOrEmpty(clientId)) { ClientDetailsEntity client = clientRepository.getClientByClientId(clientId); if (client == null) { @@ -446,9 +446,9 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt * */ private class SectorIdentifierLoader extends CacheLoader> { - private HttpComponentsClientHttpRequestFactory httpFactory; - private RestTemplate restTemplate; - private JsonParser parser = new JsonParser(); + private final HttpComponentsClientHttpRequestFactory httpFactory; + private final RestTemplate restTemplate; + private final JsonParser parser = new JsonParser(); SectorIdentifierLoader(HttpClient httpClient) { this.httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultSystemScopeService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultSystemScopeService.java index 56541584d..5eefd2f5d 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultSystemScopeService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultSystemScopeService.java @@ -44,28 +44,28 @@ public class DefaultSystemScopeService implements SystemScopeService { @Autowired private SystemScopeRepository repository; - private Predicate isDefault = new Predicate() { + private final Predicate isDefault = new Predicate() { @Override public boolean apply(SystemScope input) { return (input != null && input.isDefaultScope()); } }; - private Predicate isRestricted = new Predicate() { + private final Predicate isRestricted = new Predicate() { @Override public boolean apply(SystemScope input) { return (input != null && input.isRestricted()); } }; - private Predicate isReserved = new Predicate() { + private final Predicate isReserved = new Predicate() { @Override public boolean apply(SystemScope input) { return (input != null && getReserved().contains(input)); } }; - private Function stringToSystemScope = new Function() { + private final Function stringToSystemScope = new Function() { @Override public SystemScope apply(String input) { if (Strings.isNullOrEmpty(input)) { @@ -83,7 +83,7 @@ public class DefaultSystemScopeService implements SystemScopeService { } }; - private Function systemScopeToString = new Function() { + private final Function systemScopeToString = new Function() { @Override public String apply(SystemScope input) { if (input == null) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/UriEncodedClientUserDetailsService.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/UriEncodedClientUserDetailsService.java index 2d1b73baf..fc30239ee 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/UriEncodedClientUserDetailsService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/UriEncodedClientUserDetailsService.java @@ -40,7 +40,7 @@ import org.springframework.web.util.UriUtils; @Service("uriEncodedClientUserDetailsService") public class UriEncodedClientUserDetailsService implements UserDetailsService { - private static GrantedAuthority ROLE_CLIENT = new SimpleGrantedAuthority("ROLE_CLIENT"); + private static final GrantedAuthority ROLE_CLIENT = new SimpleGrantedAuthority("ROLE_CLIENT"); private ClientDetailsEntityService clientDetailsService; private final ConfigurationPropertiesBean config; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/token/ChainedTokenGranter.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/token/ChainedTokenGranter.java index 7470af98d..e12123635 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/token/ChainedTokenGranter.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/token/ChainedTokenGranter.java @@ -47,7 +47,7 @@ public class ChainedTokenGranter extends AbstractTokenGranter { public static final String GRANT_TYPE = "urn:ietf:params:oauth:grant_type:redelegate"; // keep down-cast versions so we can get to the right queries - private OAuth2TokenEntityService tokenServices; + private final OAuth2TokenEntityService tokenServices; /** * @param tokenServices diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/view/TokenApiView.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/view/TokenApiView.java index 3767bcdbd..8c6a7f3be 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/view/TokenApiView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/view/TokenApiView.java @@ -46,7 +46,7 @@ public class TokenApiView extends AbstractView { public static final String VIEWNAME = "tokenApiView"; - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @Override @@ -57,10 +57,7 @@ public class TokenApiView extends AbstractView { @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/OAuthConfirmationController.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/OAuthConfirmationController.java index 3b11f5371..9091a0e32 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/OAuthConfirmationController.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/OAuthConfirmationController.java @@ -127,7 +127,7 @@ public class OAuthConfirmationController { uriBuilder.addParameter("state", authRequest.getState()); // copy the state parameter if one was given } - return "redirect:" + uriBuilder.toString(); + return "redirect:" + uriBuilder; } catch (URISyntaxException e) { log.error("Can't build redirect URI for prompt=none, sending error instead", e); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/ScopeAPI.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/ScopeAPI.java index b783bf579..8feb60797 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/ScopeAPI.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/ScopeAPI.java @@ -55,7 +55,7 @@ public class ScopeAPI { @Autowired private SystemScopeService scopeService; - private Gson gson = new Gson(); + private final Gson gson = new Gson(); @RequestMapping(value = "", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public String getAll(ModelMap m) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/PerunAttributeValueAwareModel.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/PerunAttributeValueAwareModel.java index 73f6eef0a..d745f3311 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/PerunAttributeValueAwareModel.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/PerunAttributeValueAwareModel.java @@ -158,7 +158,7 @@ public abstract class PerunAttributeValueAwareModel { private InconvertibleValueException inconvertible(String clazzName) { return new InconvertibleValueException("Cannot convert value of attribute to " + clazzName + - " for object: " + this.toString()); + " for object: " + this); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/saml/PerunSamlAuthenticationSuccessHandler.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/saml/PerunSamlAuthenticationSuccessHandler.java index 4dcd8fa43..04d887af5 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/saml/PerunSamlAuthenticationSuccessHandler.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/saml/PerunSamlAuthenticationSuccessHandler.java @@ -49,7 +49,7 @@ public class PerunSamlAuthenticationSuccessHandler extends SavedRequestAwareAuth .map(AuthnContext::getAuthnContextClassRef) .map(AuthnContextClassRef::getAuthnContextClassRef) .collect(Collectors.joining()); - request.getSession(true).setAttribute(PerunOIDCTokenService.SESSION_PARAM_ACR, acrs);; + request.getSession(true).setAttribute(PerunOIDCTokenService.SESSION_PARAM_ACR, acrs); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/elixir/GA4GHClaimSource.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/elixir/GA4GHClaimSource.java index 47517d323..088a4ae88 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/elixir/GA4GHClaimSource.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/elixir/GA4GHClaimSource.java @@ -565,9 +565,9 @@ public class GA4GHClaimSource extends ClaimSource { } public static class ClaimRepository { - private String name; - private RestTemplate restTemplate; - private String actionURL; + private final String name; + private final RestTemplate restTemplate; + private final String actionURL; public ClaimRepository(String name, RestTemplate restTemplate, String actionURL) { this.name = name; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunFiltersContext.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunFiltersContext.java index 8a8e0a0c9..411b1ec97 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunFiltersContext.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunFiltersContext.java @@ -27,9 +27,9 @@ public class PerunFiltersContext { private static final String FILTER_CLASS = ".class"; private static final String PREFIX = "filter."; - private List filters; - private Properties properties; - private BeanUtil beanUtil; + private final List filters; + private final Properties properties; + private final BeanUtil beanUtil; public PerunFiltersContext(Properties properties, BeanUtil beanUtil) { this.properties = properties; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunRequestFilterParams.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunRequestFilterParams.java index 10119b4bc..d4a4c44ce 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunRequestFilterParams.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunRequestFilterParams.java @@ -10,11 +10,11 @@ import java.util.Properties; */ public class PerunRequestFilterParams { - private String filterName; + private final String filterName; - private String propertyPrefix; - private Properties properties; - private BeanUtil beanUtil; + private final String propertyPrefix; + private final Properties properties; + private final BeanUtil beanUtil; public PerunRequestFilterParams(String filterName, String propertyPrefix, Properties properties, BeanUtil beanUtil) { this.filterName = filterName; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/web/WebHtmlClasses.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/web/WebHtmlClasses.java index c6d822b35..fd2ed94ac 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/web/WebHtmlClasses.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/web/WebHtmlClasses.java @@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class WebHtmlClasses { - private String classesFilePath; + private final String classesFilePath; private Properties webHtmlClassesProperties; public WebHtmlClasses(PerunOidcConfig perunOidcConfig) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/ClientDetailsEntityJsonProcessor.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/ClientDetailsEntityJsonProcessor.java index 393d0d907..975c5b637 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/ClientDetailsEntityJsonProcessor.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/ClientDetailsEntityJsonProcessor.java @@ -90,7 +90,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class ClientDetailsEntityJsonProcessor { - private static JsonParser parser = new JsonParser(); + private static final JsonParser parser = new JsonParser(); public static ClientDetailsEntity parse(String jsonString) { JsonElement jsonEl = parser.parse(jsonString); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerAuthenticationProvider.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerAuthenticationProvider.java index 73bba3fdd..5198537dd 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerAuthenticationProvider.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerAuthenticationProvider.java @@ -59,7 +59,7 @@ public class JWTBearerAuthenticationProvider implements AuthenticationProvider { private ClientKeyCacheService validators; // Allow for time sync issues by having a window of X seconds. - private int timeSkewAllowance = 300; + private final int timeSkewAllowance = 300; // to load clients @Autowired diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerClientAssertionTokenEndpointFilter.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerClientAssertionTokenEndpointFilter.java index bbc232f91..e0e350055 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerClientAssertionTokenEndpointFilter.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/assertion/JWTBearerClientAssertionTokenEndpointFilter.java @@ -48,7 +48,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; */ public class JWTBearerClientAssertionTokenEndpointFilter extends AbstractAuthenticationProcessingFilter { - private AuthenticationEntryPoint authenticationEntryPoint = new OAuth2AuthenticationEntryPoint(); + private final AuthenticationEntryPoint authenticationEntryPoint = new OAuth2AuthenticationEntryPoint(); public JWTBearerClientAssertionTokenEndpointFilter(RequestMatcher additionalMatcher) { super(new ClientAssertionRequestMatcher(additionalMatcher)); @@ -110,7 +110,7 @@ public class JWTBearerClientAssertionTokenEndpointFilter extends AbstractAuthent private static class ClientAssertionRequestMatcher implements RequestMatcher { - private RequestMatcher additionalMatcher; + private final RequestMatcher additionalMatcher; public ClientAssertionRequestMatcher(RequestMatcher additionalMatcher) { this.additionalMatcher = additionalMatcher; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationBeanLocaleResolver.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationBeanLocaleResolver.java index 38acc4778..d9a1683cb 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationBeanLocaleResolver.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationBeanLocaleResolver.java @@ -34,7 +34,7 @@ import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver; */ public class ConfigurationBeanLocaleResolver extends AbstractLocaleContextResolver { - private ConfigurationPropertiesBean config; + private final ConfigurationPropertiesBean config; @Autowired public ConfigurationBeanLocaleResolver(ConfigurationPropertiesBean config) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java index e4c3a370d..18a3ac6c6 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java @@ -26,6 +26,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; @@ -46,9 +47,9 @@ public class JsonMessageSource extends AbstractMessageSource { private Resource baseDirectory; - private Locale fallbackLocale = new Locale("en"); // US English is the fallback language + private final Locale fallbackLocale = new Locale("en"); // US English is the fallback language - private Map> languageMaps = new HashMap<>(); + private final Map> languageMaps = new HashMap<>(); @Autowired private ConfigurationPropertiesBean config; @@ -170,7 +171,7 @@ public class JsonMessageSource extends AbstractMessageSource { log.info("No locale loaded, trying to load from {}", r); JsonParser parser = new JsonParser(); - JsonObject obj = (JsonObject) parser.parse(new InputStreamReader(r.getInputStream(), "UTF-8")); + JsonObject obj = (JsonObject) parser.parse(new InputStreamReader(r.getInputStream(), StandardCharsets.UTF_8)); set.add(obj); } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ServerConfiguration.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ServerConfiguration.java index 88a8f6c6c..40caf500c 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ServerConfiguration.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ServerConfiguration.java @@ -203,7 +203,7 @@ public class ServerConfiguration { public enum UserInfoTokenMethod { HEADER, FORM, - QUERY; + QUERY } public String getAuthorizationEndpointUri() { @@ -949,14 +949,9 @@ public class ServerConfiguration { return false; } if (userinfoSigningAlgValuesSupported == null) { - if (other.userinfoSigningAlgValuesSupported != null) { - return false; - } - } else if (!userinfoSigningAlgValuesSupported - .equals(other.userinfoSigningAlgValuesSupported)) { - return false; - } - return true; + return other.userinfoSigningAlgValuesSupported == null; + } else return userinfoSigningAlgValuesSupported + .equals(other.userinfoSigningAlgValuesSupported); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultAddress.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultAddress.java index f63262f32..f4f609a03 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultAddress.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultAddress.java @@ -205,13 +205,8 @@ public class DefaultAddress implements Address { return false; } if (streetAddress == null) { - if (other.streetAddress != null) { - return false; - } - } else if (!streetAddress.equals(other.streetAddress)) { - return false; - } - return true; + return other.streetAddress == null; + } else return streetAddress.equals(other.streetAddress); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultUserInfo.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultUserInfo.java index 53154c912..da1d4112b 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultUserInfo.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DefaultUserInfo.java @@ -617,13 +617,8 @@ public class DefaultUserInfo implements UserInfo { return false; } if (zoneinfo == null) { - if (other.zoneinfo != null) { - return false; - } - } else if (!zoneinfo.equals(other.zoneinfo)) { - return false; - } - return true; + return other.zoneinfo == null; + } else return zoneinfo.equals(other.zoneinfo); } private void writeObject(ObjectOutputStream out) throws IOException { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/convert/JsonObjectStringConverter.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/convert/JsonObjectStringConverter.java index 4760534c3..355fbca5f 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/convert/JsonObjectStringConverter.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/convert/JsonObjectStringConverter.java @@ -28,7 +28,7 @@ import org.springframework.util.StringUtils; @Converter public class JsonObjectStringConverter implements AttributeConverter { - private JsonParser parser = new JsonParser(); + private final JsonParser parser = new JsonParser(); @Override public String convertToDatabaseColumn(JsonObject attribute) { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectOAuth2RequestFactory.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectOAuth2RequestFactory.java index f719d6e57..9de7129fd 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectOAuth2RequestFactory.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectOAuth2RequestFactory.java @@ -55,7 +55,7 @@ import org.springframework.stereotype.Component; @Slf4j public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory { - private ClientDetailsEntityService clientDetailsService; + private final ClientDetailsEntityService clientDetailsService; @Autowired private ClientKeyCacheService validators; @@ -63,7 +63,7 @@ public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory { @Autowired private JWTEncryptionAndDecryptionService encryptionService; - private JsonParser parser = new JsonParser(); + private final JsonParser parser = new JsonParser(); /** * Constructor with arguments @@ -80,7 +80,7 @@ public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory { public AuthorizationRequest createAuthorizationRequest(Map inputParams) { - AuthorizationRequest request = new AuthorizationRequest(inputParams, Collections. emptyMap(), + AuthorizationRequest request = new AuthorizationRequest(inputParams, Collections.emptyMap(), inputParams.get(OAuth2Utils.CLIENT_ID), OAuth2Utils.parseParameterList(inputParams.get(OAuth2Utils.SCOPE)), null, null, false, inputParams.get(OAuth2Utils.STATE), diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectRequestParameters.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectRequestParameters.java index 0a17505b6..29d10bb2c 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectRequestParameters.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/request/ConnectRequestParameters.java @@ -17,38 +17,38 @@ package cz.muni.ics.openid.connect.request; public interface ConnectRequestParameters { - public String CLIENT_ID = "client_id"; - public String RESPONSE_TYPE = "response_type"; - public String REDIRECT_URI = "redirect_uri"; - public String STATE = "state"; - public String DISPLAY = "display"; - public String REQUEST = "request"; - public String LOGIN_HINT = "login_hint"; - public String MAX_AGE = "max_age"; - public String CLAIMS = "claims"; - public String SCOPE = "scope"; - public String NONCE = "nonce"; - public String PROMPT = "prompt"; + String CLIENT_ID = "client_id"; + String RESPONSE_TYPE = "response_type"; + String REDIRECT_URI = "redirect_uri"; + String STATE = "state"; + String DISPLAY = "display"; + String REQUEST = "request"; + String LOGIN_HINT = "login_hint"; + String MAX_AGE = "max_age"; + String CLAIMS = "claims"; + String SCOPE = "scope"; + String NONCE = "nonce"; + String PROMPT = "prompt"; // prompt values - public String PROMPT_LOGIN = "login"; - public String PROMPT_NONE = "none"; - public String PROMPT_CONSENT = "consent"; - public String PROMPT_SEPARATOR = " "; + String PROMPT_LOGIN = "login"; + String PROMPT_NONE = "none"; + String PROMPT_CONSENT = "consent"; + String PROMPT_SEPARATOR = " "; // extensions - public String APPROVED_SITE = "approved_site"; + String APPROVED_SITE = "approved_site"; // responses - public String ERROR = "error"; - public String LOGIN_REQUIRED = "login_required"; + String ERROR = "error"; + String LOGIN_REQUIRED = "login_required"; // audience - public String AUD = "aud"; + String AUD = "aud"; // PKCE - public String CODE_CHALLENGE = "code_challenge"; - public String CODE_CHALLENGE_METHOD = "code_challenge_method"; - public String CODE_VERIFIER = "code_verifier"; + String CODE_CHALLENGE = "code_challenge"; + String CODE_CHALLENGE_METHOD = "code_challenge_method"; + String CODE_VERIFIER = "code_verifier"; } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultApprovedSiteService.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultApprovedSiteService.java index 10ad98eb8..04306ef5b 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultApprovedSiteService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultApprovedSiteService.java @@ -156,7 +156,7 @@ public class DefaultApprovedSiteService implements ApprovedSiteService { } - private Predicate isExpired = new Predicate() { + private final Predicate isExpired = new Predicate() { @Override public boolean apply(ApprovedSite input) { return (input != null && input.isExpired()); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultScopeClaimTranslationService.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultScopeClaimTranslationService.java index a16bc2209..ec85f7223 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultScopeClaimTranslationService.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/service/impl/DefaultScopeClaimTranslationService.java @@ -33,7 +33,7 @@ import org.springframework.stereotype.Service; @Service("scopeClaimTranslator") public class DefaultScopeClaimTranslationService implements ScopeClaimTranslationService { - private SetMultimap scopesToClaims = HashMultimap.create(); + private final SetMultimap scopesToClaims = HashMultimap.create(); /** * Default constructor; initializes scopesToClaims map diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/AbstractClientEntityView.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/AbstractClientEntityView.java index bfe746c62..24a362e64 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/AbstractClientEntityView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/AbstractClientEntityView.java @@ -58,9 +58,9 @@ import org.springframework.web.servlet.view.AbstractView; @Slf4j public abstract class AbstractClientEntityView extends AbstractView { - private JsonParser parser = new JsonParser(); + private final JsonParser parser = new JsonParser(); - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .setExclusionStrategies(getExclusionStrategy()) .registerTypeAdapter(JWSAlgorithm.class, new JsonSerializer() { @Override diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForAdmins.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForAdmins.java index b76d6694a..162f049a0 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForAdmins.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForAdmins.java @@ -39,7 +39,7 @@ import org.springframework.validation.BeanPropertyBindingResult; public class ClientEntityViewForAdmins extends AbstractClientEntityView { public static final String VIEWNAME = "clientEntityViewAdmins"; - private Set blacklistedFields = ImmutableSet.of("additionalInformation"); + private final Set blacklistedFields = ImmutableSet.of("additionalInformation"); /** * @return @@ -50,20 +50,13 @@ public class ClientEntityViewForAdmins extends AbstractClientEntityView { @Override public boolean shouldSkipField(FieldAttributes f) { - if (blacklistedFields.contains(f.getName())) { - return true; - } else { - return false; - } + return blacklistedFields.contains(f.getName()); } @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForUsers.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForUsers.java index 5a12b7f5e..9dc028c0d 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForUsers.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientEntityViewForUsers.java @@ -39,7 +39,7 @@ import org.springframework.validation.BeanPropertyBindingResult; @Component(ClientEntityViewForUsers.VIEWNAME) public class ClientEntityViewForUsers extends AbstractClientEntityView { - private Set whitelistedFields = ImmutableSet.of("clientName", "clientId", "id", "clientDescription", "scope", "logoUri"); + private final Set whitelistedFields = ImmutableSet.of("clientName", "clientId", "id", "clientDescription", "scope", "logoUri"); public static final String VIEWNAME = "clientEntityViewUsers"; @@ -53,20 +53,13 @@ public class ClientEntityViewForUsers extends AbstractClientEntityView { @Override public boolean shouldSkipField(FieldAttributes f) { // whitelist the handful of fields that are good - if (whitelistedFields.contains(f.getName())) { - return false; - } else { - return true; - } + return !whitelistedFields.contains(f.getName()); } @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }; diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientInformationResponseView.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientInformationResponseView.java index 6e780e548..467591241 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientInformationResponseView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/ClientInformationResponseView.java @@ -51,7 +51,7 @@ public class ClientInformationResponseView extends AbstractView { public static final String VIEWNAME = "clientInformationResponseView"; // note that this won't serialize nulls by default - private Gson gson = new Gson(); + private final Gson gson = new Gson(); /* (non-Javadoc) * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonApprovedSiteView.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonApprovedSiteView.java index c93a507b3..8466f29bd 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonApprovedSiteView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonApprovedSiteView.java @@ -53,7 +53,7 @@ public class JsonApprovedSiteView extends AbstractView { public static final String VIEWNAME = "jsonApprovedSiteView"; - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @Override @@ -65,10 +65,7 @@ public class JsonApprovedSiteView extends AbstractView { @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonEntityView.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonEntityView.java index 1f8bda804..454b26d65 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonEntityView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonEntityView.java @@ -48,7 +48,7 @@ public class JsonEntityView extends AbstractView { public static final String VIEWNAME = "jsonEntityView"; - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @Override @@ -60,10 +60,7 @@ public class JsonEntityView extends AbstractView { @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonErrorView.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonErrorView.java index d21ac151d..cd4998eb0 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonErrorView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/JsonErrorView.java @@ -55,7 +55,7 @@ public class JsonErrorView extends AbstractView { public static final String VIEWNAME = "jsonErrorView"; - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @Override @@ -67,10 +67,7 @@ public class JsonErrorView extends AbstractView { @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/UserInfoView.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/UserInfoView.java index 4c3f96182..6400fe2f7 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/UserInfoView.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/view/UserInfoView.java @@ -52,7 +52,7 @@ public class UserInfoView extends AbstractView { public static final String VIEWNAME = "userInfoView"; - private static JsonParser jsonParser = new JsonParser(); + private static final JsonParser jsonParser = new JsonParser(); @Autowired private ScopeClaimTranslationService translator; @@ -68,10 +68,7 @@ public class UserInfoView extends AbstractView { @Override public boolean shouldSkipClass(Class clazz) { // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; + return clazz.equals(BeanPropertyBindingResult.class); } }).create(); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/AuthenticationTimeStamper.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/AuthenticationTimeStamper.java index 774e2815b..cc4758420 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/AuthenticationTimeStamper.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/AuthenticationTimeStamper.java @@ -64,7 +64,7 @@ public class AuthenticationTimeStamper extends SavedRequestAwareAuthenticationSu session.removeAttribute(AuthorizationRequestFilter.PROMPT_REQUESTED); } - log.info("Successful Authentication of " + authentication.getName() + " at " + authTimestamp.toString()); + log.info("Successful Authentication of " + authentication.getName() + " at " + authTimestamp); super.onAuthenticationSuccess(request, response, authentication); diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/BlacklistAPI.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/BlacklistAPI.java index e7e66a174..d443b1adc 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/BlacklistAPI.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/BlacklistAPI.java @@ -58,8 +58,8 @@ public class BlacklistAPI { @Autowired private BlacklistedSiteService blacklistService; - private Gson gson = new Gson(); - private JsonParser parser = new JsonParser(); + private final Gson gson = new Gson(); + private final JsonParser parser = new JsonParser(); /** * Get a list of all blacklisted sites diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/ClientAPI.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/ClientAPI.java index 898a8c311..73abb8708 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/ClientAPI.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/ClientAPI.java @@ -129,9 +129,9 @@ public class ClientAPI { @Qualifier("clientAssertionValidator") private AssertionValidator assertionValidator; - private JsonParser parser = new JsonParser(); + private final JsonParser parser = new JsonParser(); - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .serializeNulls() .registerTypeAdapter(JWSAlgorithm.class, new JsonDeserializer() { @Override diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/UserInfoInterceptor.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/UserInfoInterceptor.java index 9e0910039..1630cdefe 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/UserInfoInterceptor.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/UserInfoInterceptor.java @@ -45,7 +45,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; */ public class UserInfoInterceptor extends HandlerInterceptorAdapter { - private Gson gson = new GsonBuilder() + private final Gson gson = new GsonBuilder() .registerTypeHierarchyAdapter(GrantedAuthority.class, (JsonSerializer) (src, typeOfSrc, context) -> new JsonPrimitive(src.getAuthority())) .create(); @@ -53,7 +53,7 @@ public class UserInfoInterceptor extends HandlerInterceptorAdapter { @Autowired(required = false) private UserInfoService userInfoService; - private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); + private final AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/WhitelistAPI.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/WhitelistAPI.java index 701bf1191..7d4e6bf15 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/WhitelistAPI.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/web/WhitelistAPI.java @@ -58,8 +58,8 @@ public class WhitelistAPI { @Autowired private WhitelistedSiteService whitelistService; - private Gson gson = new Gson(); - private JsonParser parser = new JsonParser(); + private final Gson gson = new Gson(); + private final JsonParser parser = new JsonParser(); /** * Get a list of all whitelisted sites diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Claim.java b/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Claim.java index 3633c99f3..f12eedc48 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Claim.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Claim.java @@ -196,13 +196,8 @@ public class Claim { return false; } if (value == null) { - if (other.value != null) { - return false; - } - } else if (!value.equals(other.value)) { - return false; - } - return true; + return other.value == null; + } else return value.equals(other.value); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Policy.java b/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Policy.java index 6af06df1c..e1c8a20c3 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Policy.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/Policy.java @@ -140,13 +140,8 @@ public class Policy { return false; } if (scopes == null) { - if (other.scopes != null) { - return false; - } - } else if (!scopes.equals(other.scopes)) { - return false; - } - return true; + return other.scopes == null; + } else return scopes.equals(other.scopes); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/ResourceSet.java b/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/ResourceSet.java index 105198a35..c8ab96aa7 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/ResourceSet.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/uma/model/ResourceSet.java @@ -248,13 +248,8 @@ public class ResourceSet { return false; } if (uri == null) { - if (other.uri != null) { - return false; - } - } else if (!uri.equals(other.uri)) { - return false; - } - return true; + return other.uri == null; + } else return uri.equals(other.uri); } } diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/util/JsonUtils.java b/perun-oidc-server/src/main/java/cz/muni/ics/util/JsonUtils.java index 0696ad547..83f729ba4 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/util/JsonUtils.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/util/JsonUtils.java @@ -53,7 +53,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class JsonUtils { - private static Gson gson = new Gson(); + private static final Gson gson = new Gson(); /** * Translate a set of strings to a JSON array, empty array returned as null diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/data/AbstractPageOperationTemplateTest.java b/perun-oidc-server/src/test/java/cz/muni/ics/data/AbstractPageOperationTemplateTest.java index ced0c0bad..427c74ce8 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/data/AbstractPageOperationTemplateTest.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/data/AbstractPageOperationTemplateTest.java @@ -145,9 +145,9 @@ public class AbstractPageOperationTemplateTest { private static class CountingPageOperation extends AbstractPageOperationTemplate{ private int currentPageFetch; - private int pageSize = 10; + private final int pageSize = 10; private long counter = 0L; - private long startTime; + private final long startTime; private long timeToLastFetch; private long timeToPreviousFetch; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/discovery/util/TestWebfingerURLNormalizer.java b/perun-oidc-server/src/test/java/cz/muni/ics/discovery/util/TestWebfingerURLNormalizer.java index 9c7222e56..6ef26603a 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/discovery/util/TestWebfingerURLNormalizer.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/discovery/util/TestWebfingerURLNormalizer.java @@ -31,7 +31,7 @@ public class TestWebfingerURLNormalizer { // Test fixture: - private ImmutableMap inputToNormalized = new ImmutableMap.Builder() + private final ImmutableMap inputToNormalized = new ImmutableMap.Builder() .put("example.com", "https://example.com") .put("example.com:8080", "https://example.com:8080") .put("example.com/path", "https://example.com/path") diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/jose/TestJWKSetKeyStore.java b/perun-oidc-server/src/test/java/cz/muni/ics/jose/TestJWKSetKeyStore.java index f1c4b0f22..c7f8710f8 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/jose/TestJWKSetKeyStore.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/jose/TestJWKSetKeyStore.java @@ -45,8 +45,8 @@ import org.springframework.core.io.Resource; public class TestJWKSetKeyStore { - private String RSAkid = "rsa_1"; - private JWK RSAjwk = new RSAKey( + private final String RSAkid = "rsa_1"; + private final JWK RSAjwk = new RSAKey( new Base64URL("oahUIoWw0K0usKNuOR6H4wkf4oBUXHTxRvgb48E-BVvxkeDNjbC4he8rUW" + "cJoZmds2h7M70imEVhRU5djINXtqllXI4DFqcI1DgjT9LewND8MW2Krf3S" + "psk_ZkoFnilakGygTwpZ3uesH-PFABNIUYpOiN15dsQRkgr0vEhxN92i2a" + @@ -62,8 +62,8 @@ public class TestJWKSetKeyStore { "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null, null); - private String RSAkid_rsa2 = "rsa_2"; - private JWK RSAjwk_rsa2 = new RSAKey( + private final String RSAkid_rsa2 = "rsa_2"; + private final JWK RSAjwk_rsa2 = new RSAKey( new Base64URL("oahUIoWw0K0usKNuOR6H4wkf4oBUXHTxRvgb48E-BVvxkeDNjbC4he8rUW" + "cJoZmds2h7M70imEVhRU5djINXtqllXI4DFqcI1DgjT9LewND8MW2Krf3S" + "psk_ZkoFnilakGygTwpZ3uesH-PFABNIUYpOiN15dsQRkgr0vEhxN92i2a" + @@ -82,8 +82,8 @@ public class TestJWKSetKeyStore { List keys_list = new LinkedList<>(); private JWKSet jwkSet; - private String ks_file = "ks.txt"; - private String ks_file_badJWK = "ks_badJWK.txt"; + private final String ks_file = "ks.txt"; + private final String ks_file_badJWK = "ks_badJWK.txt"; @Before public void prepare() throws IOException { @@ -93,7 +93,7 @@ public class TestJWKSetKeyStore { jwkSet = new JWKSet(keys_list); jwkSet.getKeys(); - byte jwtbyte[] = jwkSet.toString().getBytes(); + byte[] jwtbyte = jwkSet.toString().getBytes(); FileOutputStream out = new FileOutputStream(ks_file); out.write(jwtbyte); out.close(); @@ -135,7 +135,7 @@ public class TestJWKSetKeyStore { @Test(expected=IllegalArgumentException.class) public void ksBadJWKinput() throws IOException { - byte jwtbyte[] = RSAjwk.toString().getBytes(); + byte[] jwtbyte = RSAjwk.toString().getBytes(); FileOutputStream out = new FileOutputStream(ks_file_badJWK); out.write(jwtbyte); out.close(); @@ -180,7 +180,7 @@ public class TestJWKSetKeyStore { } assertTrue(thrown); - ks.setJwkSet(jwkSet);; - assertEquals(ks.getJwkSet(), jwkSet); + ks.setJwkSet(jwkSet); + assertEquals(ks.getJwkSet(), jwkSet); } } diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java b/perun-oidc-server/src/test/java/cz/muni/ics/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java index b2a4e1d1b..b1b6e9f8d 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java @@ -63,17 +63,17 @@ import org.junit.rules.ExpectedException; @Slf4j public class TestDefaultJWTEncryptionAndDecryptionService { - private String plainText = "The true sign of intelligence is not knowledge but imagination."; + private final String plainText = "The true sign of intelligence is not knowledge but imagination."; - private String issuer = "www.example.net"; - private String subject = "example_user"; + private final String issuer = "www.example.net"; + private final String subject = "example_user"; private JWTClaimsSet claimsSet = null; @Rule public ExpectedException exception = ExpectedException.none(); // Example data taken from rfc7516 appendix A - private String compactSerializedJwe = "eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ." + + private final String compactSerializedJwe = "eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ." + "OKOawDo13gRp2ojaHV7LFpZcgV7T6DVZKTyKOMTYUmKoTCVJRgckCL9kiMT03JGe" + "ipsEdY3mx_etLbbWSrFr05kLzcSr4qKAq7YN7e9jwQRb23nfa6c9d-StnImGyFDb" + "Sv04uVuxIp5Zms1gNxKKK2Da14B8S4rzVRltdYwam_lDp5XnZAYpQdb76FdIKLaV" + @@ -85,8 +85,8 @@ public class TestDefaultJWTEncryptionAndDecryptionService { "SdiwkIr3ajwQzaBtQD_A." + "XFBoMYUZodetZdvTiFvSkQ"; - private String RSAkid = "rsa321"; - private JWK RSAjwk = new RSAKey( + private final String RSAkid = "rsa321"; + private final JWK RSAjwk = new RSAKey( new Base64URL("oahUIoWw0K0usKNuOR6H4wkf4oBUXHTxRvgb48E-BVvxkeDNjbC4he8rUW" + "cJoZmds2h7M70imEVhRU5djINXtqllXI4DFqcI1DgjT9LewND8MW2Krf3S" + "psk_ZkoFnilakGygTwpZ3uesH-PFABNIUYpOiN15dsQRkgr0vEhxN92i2a" + @@ -102,8 +102,8 @@ public class TestDefaultJWTEncryptionAndDecryptionService { "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null, null); - private String RSAkid_2 = "rsa3210"; - private JWK RSAjwk_2 = new RSAKey( + private final String RSAkid_2 = "rsa3210"; + private final JWK RSAjwk_2 = new RSAKey( new Base64URL("oahUIoWw0K0usKNuOR6H4wkf4oBUXHTxRvgb48E-BVvxkeDNjbC4he8rUW" + "cJoZmds2h7M70imEVhRU5djINXtqllXI4DFqcI1DgjT9LewND8MW2Krf3S" + "psk_ZkoFnilakGygTwpZ3uesH-PFABNIUYpOiN15dsQRkgr0vEhxN92i2a" + @@ -119,30 +119,30 @@ public class TestDefaultJWTEncryptionAndDecryptionService { "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_2, null, null, null, null, null); - private String AESkid = "aes123"; - private JWK AESjwk = new OctetSequenceKey(new Base64URL("GawgguFyGrWKav7AX4VKUg"), + private final String AESkid = "aes123"; + private final JWK AESjwk = new OctetSequenceKey(new Base64URL("GawgguFyGrWKav7AX4VKUg"), KeyUse.ENCRYPTION, null, JWEAlgorithm.A128KW, AESkid, null, null, null, null, null); - private Map keys = new ImmutableMap.Builder() + private final Map keys = new ImmutableMap.Builder() .put(RSAkid, RSAjwk) .build(); - private Map keys_2 = new ImmutableMap.Builder() + private final Map keys_2 = new ImmutableMap.Builder() .put(RSAkid, RSAjwk) .put(RSAkid_2, RSAjwk_2) .build(); - private Map keys_3 = new ImmutableMap.Builder() + private final Map keys_3 = new ImmutableMap.Builder() .put(AESkid, AESjwk) .build(); - private Map keys_4= new ImmutableMap.Builder() + private final Map keys_4= new ImmutableMap.Builder() .put(RSAkid, RSAjwk) .put(RSAkid_2, RSAjwk_2) .put(AESkid, AESjwk) .build(); - private List keys_list = new LinkedList<>(); + private final List keys_list = new LinkedList<>(); private DefaultJWTEncryptionAndDecryptionService service; private DefaultJWTEncryptionAndDecryptionService service_2; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestBlacklistAwareRedirectResolver.java b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestBlacklistAwareRedirectResolver.java index e02f3ba11..d1cf58787 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestBlacklistAwareRedirectResolver.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestBlacklistAwareRedirectResolver.java @@ -53,11 +53,11 @@ public class TestBlacklistAwareRedirectResolver { @InjectMocks private BlacklistAwareRedirectResolver resolver; - private String blacklistedUri = "https://evil.example.com/"; + private final String blacklistedUri = "https://evil.example.com/"; - private String goodUri = "https://good.example.com/"; + private final String goodUri = "https://good.example.com/"; - private String pathUri = "https://good.example.com/with/path"; + private final String pathUri = "https://good.example.com/with/path"; /** * @throws java.lang.Exception diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java index 6d863e3b7..8607baa00 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java @@ -44,9 +44,9 @@ import org.springframework.security.oauth2.provider.OAuth2Request; public class TestDefaultIntrospectionResultAssembler { - private IntrospectionResultAssembler assembler = new DefaultIntrospectionResultAssembler(); + private final IntrospectionResultAssembler assembler = new DefaultIntrospectionResultAssembler(); - private static DateFormatter dateFormat = new DateFormatter(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")); + private static final DateFormatter dateFormat = new DateFormatter(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")); @Test public void shouldAssembleExpectedResultForAccessToken() throws ParseException { diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java index 40affd2f4..0fa9786b7 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java @@ -86,13 +86,13 @@ public class TestDefaultOAuth2ProviderTokenService { private OAuth2Authentication authentication; private ClientDetailsEntity client; private ClientDetailsEntity badClient; - private String clientId = "test_client"; - private String badClientId = "bad_client"; - private Set scope = newHashSet("openid", "profile", "email", "offline_access"); + private final String clientId = "test_client"; + private final String badClientId = "bad_client"; + private final Set scope = newHashSet("openid", "profile", "email", "offline_access"); private OAuth2RefreshTokenEntity refreshToken; private OAuth2AccessTokenEntity accessToken; - private String refreshTokenValue = "refresh_token_value"; - private String userName = "6a50ac11786d402a9591d3e592ac770f"; + private final String refreshTokenValue = "refresh_token_value"; + private final String userName = "6a50ac11786d402a9591d3e592ac770f"; private final String issuer = "https://issuer.com/oidc/"; private TokenRequest tokenRequest; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultSystemScopeService.java b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultSystemScopeService.java index 1ca44db64..993ce86d2 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultSystemScopeService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/oauth2/service/impl/TestDefaultSystemScopeService.java @@ -49,12 +49,12 @@ public class TestDefaultSystemScopeService { private SystemScope dynScope1; private SystemScope restrictedScope1; - private String defaultDynScope1String = "defaultDynScope1"; - private String defaultDynScope2String = "defaultDynScope2"; - private String defaultScope1String = "defaultScope1"; - private String defaultScope2String = "defaultScope2"; - private String dynScope1String = "dynScope1"; - private String restrictedScope1String = "restrictedScope1"; + private final String defaultDynScope1String = "defaultDynScope1"; + private final String defaultDynScope2String = "defaultDynScope2"; + private final String defaultScope1String = "defaultScope1"; + private final String defaultScope2String = "defaultScope2"; + private final String dynScope1String = "dynScope1"; + private final String restrictedScope1String = "restrictedScope1"; private Set allScopes; private Set allScopeStrings; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/assertion/TestJWTBearerAuthenticationProvider.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/assertion/TestJWTBearerAuthenticationProvider.java index 072d366f0..555cce7d4 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/assertion/TestJWTBearerAuthenticationProvider.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/assertion/TestJWTBearerAuthenticationProvider.java @@ -67,9 +67,9 @@ public class TestJWTBearerAuthenticationProvider { @Mock private JWTSigningAndValidationService validator; - private GrantedAuthority authority1 = new SimpleGrantedAuthority("1"); - private GrantedAuthority authority2 = new SimpleGrantedAuthority("2"); - private GrantedAuthority authority3 = new SimpleGrantedAuthority("3"); + private final GrantedAuthority authority1 = new SimpleGrantedAuthority("1"); + private final GrantedAuthority authority2 = new SimpleGrantedAuthority("2"); + private final GrantedAuthority authority3 = new SimpleGrantedAuthority("3"); @Before public void setup() { diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java index c6a5b2f98..0afbc9505 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java @@ -23,9 +23,9 @@ public class TestJsonMessageSource { @Spy private ConfigurationPropertiesBean config; - private Locale localeThatHasAFile = new Locale("en"); + private final Locale localeThatHasAFile = new Locale("en"); - private Locale localeThatDoesNotHaveAFile = new Locale("xx"); + private final Locale localeThatDoesNotHaveAFile = new Locale("xx"); @Before public void setup() { diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java index fa017a6b3..1c5d90b4f 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java @@ -43,9 +43,9 @@ public class TestDefaultBlacklistedSiteService { private BlacklistedSite site1; private BlacklistedSite site2; - private String uri1 = "black1"; - private String uri2 = "black2"; - private String uri3 = "not-black"; + private final String uri1 = "black1"; + private final String uri2 = "black2"; + private final String uri3 = "not-black"; private Set blackListedSitesSet; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultOIDCTokenService.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultOIDCTokenService.java index 5ae893444..32fbd76de 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultOIDCTokenService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultOIDCTokenService.java @@ -37,10 +37,10 @@ public class TestDefaultOIDCTokenService { private static final String CLIENT_ID = "client"; private static final String KEY_ID = "key"; - private ConfigurationPropertiesBean configBean = new ConfigurationPropertiesBean(); - private ClientDetailsEntity client = new ClientDetailsEntity(); - private OAuth2AccessTokenEntity accessToken = new OAuth2AccessTokenEntity(); - private OAuth2Request request = new OAuth2Request(CLIENT_ID) { }; + private final ConfigurationPropertiesBean configBean = new ConfigurationPropertiesBean(); + private final ClientDetailsEntity client = new ClientDetailsEntity(); + private final OAuth2AccessTokenEntity accessToken = new OAuth2AccessTokenEntity(); + private final OAuth2Request request = new OAuth2Request(CLIENT_ID) { }; @Mock private JWTSigningAndValidationService jwtService; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultUserInfoService.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultUserInfoService.java index 9347dc902..68670348a 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultUserInfoService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestDefaultUserInfoService.java @@ -68,25 +68,25 @@ public class TestDefaultUserInfoService { private ClientDetailsEntity pairwiseClient3; private ClientDetailsEntity pairwiseClient4; - private String adminUsername = "username"; - private String regularUsername = "regular"; - private String adminSub = "adminSub12d3a1f34a2"; - private String regularSub = "regularSub652ha23b"; + private final String adminUsername = "username"; + private final String regularUsername = "regular"; + private final String adminSub = "adminSub12d3a1f34a2"; + private final String regularSub = "regularSub652ha23b"; - private String pairwiseSub12 = "regularPairwise-12-31ijoef"; - private String pairwiseSub3 = "regularPairwise-3-1ojadsio"; - private String pairwiseSub4 = "regularPairwise-4-1ojadsio"; + private final String pairwiseSub12 = "regularPairwise-12-31ijoef"; + private final String pairwiseSub3 = "regularPairwise-3-1ojadsio"; + private final String pairwiseSub4 = "regularPairwise-4-1ojadsio"; - private String publicClientId1 = "publicClient-1-313124"; - private String publicClientId2 = "publicClient-2-4109312"; - private String pairwiseClientId1 = "pairwiseClient-1-2312"; - private String pairwiseClientId2 = "pairwiseClient-2-324416"; - private String pairwiseClientId3 = "pairwiseClient-3-154157"; - private String pairwiseClientId4 = "pairwiseClient-4-4589723"; + private final String publicClientId1 = "publicClient-1-313124"; + private final String publicClientId2 = "publicClient-2-4109312"; + private final String pairwiseClientId1 = "pairwiseClient-1-2312"; + private final String pairwiseClientId2 = "pairwiseClient-2-324416"; + private final String pairwiseClientId3 = "pairwiseClient-3-154157"; + private final String pairwiseClientId4 = "pairwiseClient-4-4589723"; - private String sectorIdentifier1 = "https://sector-identifier-12/url"; - private String sectorIdentifier2 = "https://sector-identifier-12/url2"; - private String sectorIdentifier3 = "https://sector-identifier-3/url"; + private final String sectorIdentifier1 = "https://sector-identifier-12/url"; + private final String sectorIdentifier2 = "https://sector-identifier-12/url2"; + private final String sectorIdentifier3 = "https://sector-identifier-3/url"; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestUUIDPairwiseIdentiferService.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestUUIDPairwiseIdentiferService.java index 0aef17a0e..1a7bea6ae 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestUUIDPairwiseIdentiferService.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/service/impl/TestUUIDPairwiseIdentiferService.java @@ -61,28 +61,28 @@ public class TestUUIDPairwiseIdentiferService { private ClientDetailsEntity pairwiseClient4; private ClientDetailsEntity pairwiseClient5; - private String regularUsername = "regular"; - private String regularSub = "regularSub652ha23b"; - private String pairwiseSub = "pairwise-12-regular-user"; + private final String regularUsername = "regular"; + private final String regularSub = "regularSub652ha23b"; + private final String pairwiseSub = "pairwise-12-regular-user"; - private String pairwiseClientId1 = "pairwiseClient-1-2312"; - private String pairwiseClientId2 = "pairwiseClient-2-324416"; - private String pairwiseClientId3 = "pairwiseClient-3-154157"; - private String pairwiseClientId4 = "pairwiseClient-4-4589723"; - private String pairwiseClientId5 = "pairwiseClient-5-34908713"; + private final String pairwiseClientId1 = "pairwiseClient-1-2312"; + private final String pairwiseClientId2 = "pairwiseClient-2-324416"; + private final String pairwiseClientId3 = "pairwiseClient-3-154157"; + private final String pairwiseClientId4 = "pairwiseClient-4-4589723"; + private final String pairwiseClientId5 = "pairwiseClient-5-34908713"; - private String sectorHost12 = "sector-identifier-12"; - private String sectorHost3 = "sector-identifier-3"; - private String clientHost4 = "client-redirect-4"; - private String clientHost5 = "client-redirect-5"; + private final String sectorHost12 = "sector-identifier-12"; + private final String sectorHost3 = "sector-identifier-3"; + private final String clientHost4 = "client-redirect-4"; + private final String clientHost5 = "client-redirect-5"; - private String sectorIdentifier1 = "https://" + sectorHost12 + "/url"; - private String sectorIdentifier2 = "https://" + sectorHost12 + "/url2"; - private String sectorIdentifier3 = "https://" + sectorHost3 + "/url"; + private final String sectorIdentifier1 = "https://" + sectorHost12 + "/url"; + private final String sectorIdentifier2 = "https://" + sectorHost12 + "/url2"; + private final String sectorIdentifier3 = "https://" + sectorHost3 + "/url"; - private Set pairwiseClient3RedirectUris = ImmutableSet.of("https://" + sectorHost3 + "/oauth", "https://" + sectorHost3 + "/other"); - private Set pairwiseClient4RedirectUris = ImmutableSet.of("https://" + clientHost4 + "/oauth"); - private Set pairwiseClient5RedirectUris = ImmutableSet.of("https://" + clientHost5 + "/oauth", "https://" + clientHost5 + "/other"); + private final Set pairwiseClient3RedirectUris = ImmutableSet.of("https://" + sectorHost3 + "/oauth", "https://" + sectorHost3 + "/other"); + private final Set pairwiseClient4RedirectUris = ImmutableSet.of("https://" + clientHost4 + "/oauth"); + private final Set pairwiseClient5RedirectUris = ImmutableSet.of("https://" + clientHost5 + "/oauth", "https://" + clientHost5 + "/other"); private PairwiseIdentifier savedPairwiseIdentifier; diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/token/TestConnectTokenEnhancer.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/token/TestConnectTokenEnhancer.java index 917f22477..6921c6c22 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/token/TestConnectTokenEnhancer.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/token/TestConnectTokenEnhancer.java @@ -44,7 +44,7 @@ public class TestConnectTokenEnhancer { private static final String CLIENT_ID = "client"; private static final String KEY_ID = "key"; - private ConfigurationPropertiesBean configBean = new ConfigurationPropertiesBean(); + private final ConfigurationPropertiesBean configBean = new ConfigurationPropertiesBean(); @Mock private JWTSigningAndValidationService jwtService; @@ -61,7 +61,7 @@ public class TestConnectTokenEnhancer { @Mock private OAuth2Authentication authentication; - private OAuth2Request request = new OAuth2Request(CLIENT_ID) { }; + private final OAuth2Request request = new OAuth2Request(CLIENT_ID) { }; @InjectMocks private ConnectTokenEnhancer enhancer = new ConnectTokenEnhancer();