automated code formatting and cleanup

Author: jricher

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

@@ -16,6 +16,8 @@
  *******************************************************************************/
 package org.mitre.oauth2.introspectingfilter;
 
+import static org.mitre.oauth2.model.ClientDetailsEntity.AuthMethod.SECRET_BASIC;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.Calendar;
@@ -54,8 +56,6 @@
 import com.google.gson.JsonParser;
 import com.nimbusds.jose.util.Base64;
 
-import static org.mitre.oauth2.model.ClientDetailsEntity.AuthMethod.SECRET_BASIC;
-
 /**
  * This ResourceServerTokenServices implementation introspects incoming tokens at a
  * server's introspection endpoint URL and passes an Authentication object along

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.mitre.oauth2.introspectingfilter.service;
 

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.mitre.oauth2.introspectingfilter.service;
 

openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/service/impl/JWTParsingIntrospectionConfigurationService.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.mitre.oauth2.introspectingfilter.service.impl;
 
@@ -32,11 +32,11 @@
 import com.nimbusds.jwt.JWTParser;
 
 /**
- * 
+ *
  * Parses the incoming accesstoken as a JWT and determines the issuer based on
  * the "iss" field inside the JWT. Uses the ServerConfigurationService to determine
  * the introspection URL for that issuer.
- * 
+ *
  * @author jricher
  *
  */

openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/service/impl/ScopeBasedIntrospectionAuthoritiesGranter.java

@@ -34,7 +34,7 @@
  *
  */
 public class ScopeBasedIntrospectionAuthoritiesGranter implements IntrospectionAuthorityGranter {
-	
+
 	private List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_API");
 
 	/* (non-Javadoc)
@@ -43,15 +43,15 @@ public class ScopeBasedIntrospectionAuthoritiesGranter implements IntrospectionA
 	@Override
 	public List<GrantedAuthority> getAuthorities(JsonObject introspectionResponse) {
 		List<GrantedAuthority> auth = new ArrayList<>(getAuthorities());
-		
+
 		if (introspectionResponse.has("scope") && introspectionResponse.get("scope").isJsonPrimitive()) {
 			String scopeString = introspectionResponse.get("scope").getAsString();
 			Set<String> scopes = OAuth2Utils.parseParameterList(scopeString);
 			for (String scope : scopes) {
 				auth.add(new SimpleGrantedAuthority("OAUTH_SCOPE_" + scope));
 			}
 		}
-		
+
 		return auth;
 	}
 

openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/service/impl/SimpleIntrospectionAuthorityGranter.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.mitre.oauth2.introspectingfilter.service.impl;
 
@@ -28,9 +28,9 @@
 import com.google.gson.JsonObject;
 
 /**
- * 
+ *
  * Grants the same set of authorities no matter what's passed in.
- * 
+ *
  * @author jricher
  *
  */

openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/service/impl/StaticIntrospectionConfigurationService.java

@@ -15,18 +15,18 @@
  * limitations under the License.
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.mitre.oauth2.introspectingfilter.service.impl;
 
 import org.mitre.oauth2.introspectingfilter.service.IntrospectionConfigurationService;
 import org.mitre.oauth2.model.RegisteredClient;
 
 /**
- * 
+ *
  * Always provides the (configured) IntrospectionURL and RegisteredClient regardless
  * of token. Useful for talking to a single, trusted authorization server.
- * 
+ *
  * @author jricher
  *
  */

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

@@ -7,9 +7,9 @@ public class AuthorizationEndpointException extends AuthenticationServiceExcepti
 	private static final long serialVersionUID = 6953119789654778380L;
 
 	private String error;
-	
+
 	private String errorDescription;
-	
+
 	private String errorURI;
 
 	public AuthorizationEndpointException(String error, String errorDescription, String errorURI) {

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  *******************************************************************************/
 /**
- * 
+ *
  */
 package org.mitre.openid.connect.client;
 
@@ -34,13 +34,13 @@
 import com.nimbusds.jwt.JWTClaimsSet;
 
 /**
- * 
+ *
  * Simple mapper that adds ROLE_USER to the authorities map for all queries,
  * plus adds ROLE_ADMIN if the subject and issuer pair are found in the
  * configurable "admins" set.
- * 
+ *
  * @author jricher
- * 
+ *
  */
 public class NamedAdminAuthoritiesMapper implements OIDCAuthoritiesMapper {
 

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

@@ -88,9 +88,9 @@
 
 /**
  * OpenID Connect Authentication Filter class
- * 
+ *
  * @author nemonik, jricher
- * 
+ *
  */
 public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 
@@ -169,9 +169,9 @@ public void afterPropertiesSet() {
 
 	/*
 	 * This is the main entry point for the filter.
-	 * 
+	 *
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.springframework.security.web.authentication.
 	 * AbstractAuthenticationProcessingFilter
 	 * #attemptAuthentication(javax.servlet.http.HttpServletRequest,
@@ -204,7 +204,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
 
 	/**
 	 * Initiate an Authorization request
-	 * 
+	 *
 	 * @param request
 	 *            The request from which to extract parameters and perform the
 	 *            authentication
@@ -270,7 +270,7 @@ protected void handleAuthorizationRequest(HttpServletRequest request, HttpServle
 			String state = createState(session);
 
 			Map<String, String> options = authOptions.getOptions(serverConfig, clientConfig, request);
-			
+
 			// if we're using PKCE, handle the challenge here
 			if (clientConfig.getCodeChallengeMethod() != null) {
 				String codeVerifier = createCodeVerifier(session);
@@ -287,7 +287,7 @@ protected void handleAuthorizationRequest(HttpServletRequest request, HttpServle
 						e.printStackTrace();
 					}
 
-					
+
 				}
 			}
 
@@ -330,7 +330,7 @@ protected Authentication handleAuthorizationCodeResponse(HttpServletRequest requ
 		form.add("grant_type", "authorization_code");
 		form.add("code", authorizationCode);
 		form.setAll(authOptions.getTokenOptions(serverConfig, clientConfig, request));
-		
+
 		String codeVerifier = getStoredCodeVerifier(session);
 		if (codeVerifier != null) {
 			form.add("code_verifier", codeVerifier);
@@ -345,11 +345,11 @@ protected Authentication handleAuthorizationCodeResponse(HttpServletRequest requ
 
 		if(httpClient == null) {
 			httpClient = HttpClientBuilder.create()
-										  .useSystemProperties()
-										  .setDefaultRequestConfig(RequestConfig.custom()
-																				.setSocketTimeout(httpSocketTimeout)
-																				.build())
-										  .build();
+					.useSystemProperties()
+					.setDefaultRequestConfig(RequestConfig.custom()
+							.setSocketTimeout(httpSocketTimeout)
+							.build())
+					.build();
 		}
 
 		HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
@@ -634,7 +634,7 @@ protected ClientHttpRequest createRequest(URI url, HttpMethod method) throws IOE
 
 	/**
 	 * Handle Authorization Endpoint error
-	 * 
+	 *
 	 * @param request
 	 *            The request from which to extract parameters and handle the
 	 *            error
@@ -708,7 +708,7 @@ protected static String createState(HttpSession session) {
 	protected static String getStoredState(HttpSession session) {
 		return getStoredSessionString(session, STATE_SESSION_VARIABLE);
 	}
-	
+
 	/**
 	 * Create a random code challenge and store it in the session
 	 * @param session
@@ -719,7 +719,7 @@ protected static String createCodeVerifier(HttpSession session) {
 		session.setAttribute(CODE_VERIFIER_SESSION_VARIABLE, challenge);
 		return challenge;
 	}
-	
+
 	/**
 	 * Retrieve the stored challenge from our session
 	 * @param session