automated code format cleanup

Author: jricher

openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java

@@ -68,11 +68,11 @@ public class IntrospectingTokenService implements ResourceServerTokenServices {
 private IntrospectionConfigurationService introspectionConfigurationService;
 private IntrospectionAuthorityGranter introspectionAuthorityGranter = new SimpleIntrospectionAuthorityGranter();
 
-private int defaultExpireTime = 300000; // 5 minutes in milliseconds 
+private int defaultExpireTime = 300000; // 5 minutes in milliseconds
 private boolean forceCacheExpireTime = false; // force removal of cached tokens based on default expire time
 private boolean cacheNonExpiringTokens = false;
 private boolean cacheTokens = true;
-
+
 private HttpClient httpClient = HttpClientBuilder.create()
 .useSystemProperties()
 .build();
@@ -83,15 +83,15 @@ private class TokenCacheObject {
 OAuth2AccessToken token;
 OAuth2Authentication auth;
 Date cacheExpire;
-
+
 private TokenCacheObject(OAuth2AccessToken token, OAuth2Authentication auth) {
 this.token = token;
 this.auth = auth;
-
+
 // we don't need to check the cacheTokens values, because this won't actually be added to the cache if cacheTokens is false
 // if the token isn't null we use the token expire time
 // if forceCacheExpireTime is also true, we also make sure that the token expire time is shorter than the default expire time
-if ((this.token.getExpiration() != null) && (!forceCacheExpireTime || (forceCacheExpireTime && (this.token.getExpiration().getTime() - System.currentTimeMillis() <= defaultExpireTime)))) { 
+if ((this.token.getExpiration() != null) && (!forceCacheExpireTime || (forceCacheExpireTime && (this.token.getExpiration().getTime() - System.currentTimeMillis() <= defaultExpireTime)))) {
 this.cacheExpire = this.token.getExpiration();
 } else { // if the token doesn't have an expire time, or if the using forceCacheExpireTime the token expire time is longer than the default, then use the default expire time
 Calendar cal = Calendar.getInstance();
@@ -150,7 +150,7 @@ public int getDefaultExpireTime() {
 public void setDefaultExpireTime(int defaultExpireTime) {
 this.defaultExpireTime = defaultExpireTime;
 }
-
+
 /**
  * check if forcing a cache expire time maximum value
  * @return the forceCacheExpireTime setting
@@ -198,10 +198,10 @@ public boolean isCacheTokens() {
 public void setCacheTokens(boolean cacheTokens) {
 this.cacheTokens = cacheTokens;
 }
-
+
 /**
  * Check to see if the introspection end point response for a token has been cached locally
- * This call will return the token if it has been cached and is still valid according to 
+ * This call will return the token if it has been cached and is still valid according to
  * the cache expire time on the TokenCacheObject. If a cached value has been found but is
  * expired, either by default expire times or the token's own expire time, then the token is
  * removed from the cache and null is returned.
@@ -211,7 +211,7 @@ public void setCacheTokens(boolean cacheTokens) {
 private TokenCacheObject checkCache(String key) {
 if (cacheTokens && authCache.containsKey(key)) {
 TokenCacheObject tco = authCache.get(key);
-
+
 if (tco != null && tco.cacheExpire != null && tco.cacheExpire.after(new Date())) {
 return tco;
 } else {
@@ -246,7 +246,7 @@ private OAuth2AccessToken createAccessToken(final JsonObject token, final String
 
 /**
  * Validate a token string against the introspection endpoint,
- * then parse it and store it in the local cache if caching is enabled. 
+ * then parse it and store it in the local cache if caching is enabled.
  *
  * @param accessToken Token to pass to the introspection endpoint
  * @return TokenCacheObject containing authentication and token if the token was valid, otherwise null

openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java

@@ -45,7 +45,7 @@
 public class NamedAdminAuthoritiesMapper implements OIDCAuthoritiesMapper {
 
 private static Logger logger = LoggerFactory.getLogger(NamedAdminAuthoritiesMapper.class);
-
+
 private static final SimpleGrantedAuthority ROLE_ADMIN = new SimpleGrantedAuthority("ROLE_ADMIN");
 private static final SimpleGrantedAuthority ROLE_USER = new SimpleGrantedAuthority("ROLE_USER");
 
@@ -57,17 +57,17 @@ public Collection<? extends GrantedAuthority> mapAuthorities(JWT idToken, UserIn
 Set<GrantedAuthority> out = new HashSet<>();
 try {
 ReadOnlyJWTClaimsSet claims = idToken.getJWTClaimsSet();
-
+
 SubjectIssuerGrantedAuthority authority = new SubjectIssuerGrantedAuthority(claims.getSubject(), claims.getIssuer());
 out.add(authority);
 
 if (admins.contains(authority)) {
 out.add(ROLE_ADMIN);
 }
-
+
 // everybody's a user by default
 out.add(ROLE_USER);
-
+
 } catch (ParseException e) {
 logger.error("Unable to parse ID Token inside of authorities mapper (huh?)");
 }

openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java

@@ -333,8 +333,8 @@ protected Authentication handleAuthorizationCodeResponse(HttpServletRequest requ
 protected ClientHttpRequest createRequest(URI url, HttpMethod method) throws IOException {
 ClientHttpRequest httpRequest = super.createRequest(url, method);
 httpRequest.getHeaders().add("Authorization",
-String.format("Basic %s", Base64.encode(String.format("%s:%s", 
-UriUtils.encodePathSegment(clientConfig.getClientId(), "UTF-8"), 
+String.format("Basic %s", Base64.encode(String.format("%s:%s",
+UriUtils.encodePathSegment(clientConfig.getClientId(), "UTF-8"),
 UriUtils.encodePathSegment(clientConfig.getClientSecret(), "UTF-8")))));
 
 return httpRequest;
@@ -581,10 +581,10 @@ protected ClientHttpRequest createRequest(URI url, HttpMethod method) throws IOE
 
 // construct an PendingOIDCAuthenticationToken and return a Authentication object w/the userId and the idToken
 
-PendingOIDCAuthenticationToken token = new PendingOIDCAuthenticationToken(idClaims.getSubject(), idClaims.getIssuer(), 
-serverConfig, 
+PendingOIDCAuthenticationToken token = new PendingOIDCAuthenticationToken(idClaims.getSubject(), idClaims.getIssuer(),
+serverConfig,
 idToken, accessTokenValue, refreshTokenValue);
-
+
 Authentication authentication = this.getAuthenticationManager().authenticate(token);
 
 return authentication;

openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java

@@ -39,7 +39,7 @@
 public class OIDCAuthenticationProvider implements AuthenticationProvider {
 
 private static Logger logger = LoggerFactory.getLogger(OIDCAuthenticationProvider.class);
-
+
 private UserInfoFetcher userInfoFetcher = new UserInfoFetcher();
 
 private OIDCAuthoritiesMapper authoritiesMapper = new NamedAdminAuthoritiesMapper();
@@ -60,15 +60,15 @@ public Authentication authenticate(final Authentication authentication) throws A
 if (authentication instanceof PendingOIDCAuthenticationToken) {
 
 PendingOIDCAuthenticationToken token = (PendingOIDCAuthenticationToken) authentication;
-
+
 // get the ID Token value out
 JWT idToken = token.getIdToken();
 
 // load the user info if we can
 UserInfo userInfo = userInfoFetcher.loadUserInfo(token);
 
 if (userInfo == null) {
-// user info not found -- could be an error, could be fine 
+// user info not found -- could be an error, could be fine
 } else {
 // if we found userinfo, double check it
 if (!Strings.isNullOrEmpty(userInfo.getSub()) && !userInfo.getSub().equals(token.getSub())) {

openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthoritiesMapper.java

@@ -32,7 +32,7 @@ public interface OIDCAuthoritiesMapper {
 
 /**
  * @param idToken the ID Token (parsed as a JWT, cannot be @null)
- * @param userInfo userInfo of the current user (could be @null) 
+ * @param userInfo userInfo of the current user (could be @null)
  * @return the set of authorities to map to this user
  */
 Collection<? extends GrantedAuthority> mapAuthorities(JWT idToken, UserInfo userInfo);

openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestOptionsService.java

@@ -46,7 +46,7 @@ public interface AuthRequestOptionsService {
  * @return
  */
 public Map<String, String> getOptions(ServerConfiguration server, RegisteredClient client, HttpServletRequest request);
-
+
 /**
  * The set of options needed at the token endpoint.
  * 

openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java

@@ -25,7 +25,7 @@
 import org.mitre.openid.connect.config.ServerConfiguration;
 
 /**
- * Builds a URL string to the IdP's authorization endpoint. 
+ * Builds a URL string to the IdP's authorization endpoint.
  * 
  * @author jricher
  *
@@ -38,7 +38,7 @@ public interface AuthRequestUrlBuilder {
  * @param redirectUri
  * @param nonce
  * @param state
- * @param loginHint 
+ * @param loginHint
  * @return
  */
 public String buildAuthRequestUrl(ServerConfiguration serverConfig, RegisteredClient clientConfig, String redirectUri, String nonce, String state, Map<String, String> options, String loginHint);

openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/EncryptedAuthRequestUrlBuilder.java

@@ -78,7 +78,7 @@ public String buildAuthRequestUrl(ServerConfiguration serverConfig, RegisteredCl
 for (Entry<String, String> option : options.entrySet()) {
 claims.setClaim(option.getKey(), option.getValue());
 }
-
+
 // if there's a login hint, send it
 if (!Strings.isNullOrEmpty(loginHint)) {
 claims.setClaim("login_hint", loginHint);

openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/PlainAuthRequestUrlBuilder.java

@@ -63,7 +63,7 @@ public String buildAuthRequestUrl(ServerConfiguration serverConfig, RegisteredCl
 for (Entry<String, String> option : options.entrySet()) {
 uriBuilder.addParameter(option.getKey(), option.getValue());
 }
-
+
 // if there's a login hint, send it
 if (!Strings.isNullOrEmpty(loginHint)) {
 uriBuilder.addParameter("login_hint", loginHint);

openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/SignedAuthRequestUrlBuilder.java

@@ -72,7 +72,7 @@ public String buildAuthRequestUrl(ServerConfiguration serverConfig, RegisteredCl
 for (Entry<String, String> option : options.entrySet()) {
 claims.setClaim(option.getKey(), option.getValue());
 }
-
+
 // if there's a login hint, send it
 if (!Strings.isNullOrEmpty(loginHint)) {
 claims.setClaim("login_hint", loginHint);