made logger declarations consistent across project, closes #780

pull/803/head
Justin Richer 2015-03-08 21:56:33 -04:00
parent 849a2b3271
commit c09b63c69f
53 changed files with 211 additions and 53 deletions

View File

@ -84,7 +84,10 @@ public class IntrospectingTokenService implements ResourceServerTokenServices {
}
private Map<String, TokenCacheObject> authCache = new HashMap<String, TokenCacheObject>();
private static Logger logger = LoggerFactory.getLogger(IntrospectingTokenService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(IntrospectingTokenService.class);
/**
* @return the introspectionConfigurationService

View File

@ -47,7 +47,10 @@ import com.google.gson.JsonParser;
*/
public class UserInfoFetcher {
private Logger logger = LoggerFactory.getLogger(UserInfoFetcher.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(UserInfoFetcher.class);
public UserInfo loadUserInfo(final OIDCAuthenticationToken token) {

View File

@ -55,7 +55,10 @@ import com.google.gson.JsonObject;
*/
public class DynamicRegistrationClientConfigurationService implements ClientConfigurationService {
private static Logger logger = LoggerFactory.getLogger(DynamicServerConfigurationService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DynamicRegistrationClientConfigurationService.class);
private LoadingCache<ServerConfiguration, RegisteredClient> clients;

View File

@ -57,7 +57,10 @@ import com.google.gson.JsonParser;
*/
public class DynamicServerConfigurationService implements ServerConfigurationService {
private static Logger logger = LoggerFactory.getLogger(DynamicServerConfigurationService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DynamicServerConfigurationService.class);
// map of issuer -> server configuration, loaded dynamically from service discovery
private LoadingCache<String, ServerConfiguration> servers;

View File

@ -50,7 +50,10 @@ import com.google.gson.JsonSerializer;
*/
public class JsonFileRegisteredClientService implements RegisteredClientService {
private static Logger logger = LoggerFactory.getLogger(JsonFileRegisteredClientService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JsonFileRegisteredClientService.class);
private Gson gson = new GsonBuilder()
.registerTypeAdapter(RegisteredClient.class, new JsonSerializer<RegisteredClient>() {

View File

@ -55,7 +55,10 @@ import com.google.gson.JsonParser;
*/
public class WebfingerIssuerService implements IssuerService {
private static Logger logger = LoggerFactory.getLogger(WebfingerIssuerService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(WebfingerIssuerService.class);
// map of user input -> issuer, loaded dynamically from webfinger discover
private LoadingCache<UriComponents, String> issuers;

View File

@ -35,7 +35,10 @@ import com.google.common.base.Strings;
*/
public class WebfingerURLNormalizer {
private static Logger logger = LoggerFactory.getLogger(WebfingerURLNormalizer.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(WebfingerURLNormalizer.class);
// pattern used to parse user input; we can't use the built-in java URI parser
private static final Pattern pattern = Pattern.compile("^" +

View File

@ -52,7 +52,10 @@ import com.nimbusds.jose.jwk.RSAKey;
*/
public class DefaultJWTEncryptionAndDecryptionService implements JWTEncryptionAndDecryptionService {
private static Logger logger = LoggerFactory.getLogger(DefaultJWTEncryptionAndDecryptionService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultJWTEncryptionAndDecryptionService.class);
// map of identifier to encrypter
private Map<String, JWEEncrypter> encrypters = new HashMap<String, JWEEncrypter>();

View File

@ -53,7 +53,10 @@ public class DefaultJWTSigningAndValidationService implements JWTSigningAndValid
// map of identifier to verifier
private Map<String, JWSVerifier> verifiers = new HashMap<String, JWSVerifier>();
private static Logger logger = LoggerFactory.getLogger(DefaultJWTSigningAndValidationService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultJWTSigningAndValidationService.class);
private String defaultSignerKeyId;

View File

@ -51,7 +51,10 @@ import com.nimbusds.jose.jwk.JWKSet;
@Service
public class JWKSetCacheService {
private static Logger logger = LoggerFactory.getLogger(JWKSetCacheService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JWKSetCacheService.class);
// map of jwk set uri -> signing/validation service built on the keys found in that jwk set
private LoadingCache<String, JWTSigningAndValidationService> validators;

View File

@ -48,7 +48,10 @@ import com.nimbusds.jose.util.Base64URL;
@Service
public class SymmetricKeyJWTValidatorCacheService {
private static Logger logger = LoggerFactory.getLogger(SymmetricKeyJWTValidatorCacheService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(SymmetricKeyJWTValidatorCacheService.class);
private LoadingCache<String, JWTSigningAndValidationService> validators;

View File

@ -37,7 +37,10 @@ import org.springframework.util.StringUtils;
*/
public class ConfigurationPropertiesBean {
private static Logger logger = LoggerFactory.getLogger(ConfigurationPropertiesBean.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ConfigurationPropertiesBean.class);
private String issuer;

View File

@ -43,7 +43,10 @@ import com.nimbusds.jose.jwk.JWKSet;
public class JWKSetView extends AbstractView {
public static final String VIEWNAME = "jwkSet";
private static Logger logger = LoggerFactory.getLogger(JWKSetView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JWKSetView.class);
@Override
protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) {

View File

@ -59,8 +59,11 @@ import com.nimbusds.jose.JWSAlgorithm;
@SuppressWarnings(value = {"rawtypes", "unchecked"})
public class JsonUtils {
private static Logger logger = LoggerFactory.getLogger(JsonUtils.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JsonUtils.class);
private static Gson gson = new Gson();
/**

View File

@ -47,7 +47,10 @@ import com.google.gson.JsonObject;
@Component("webfingerView")
public class WebfingerView extends AbstractView {
private static Logger logger = LoggerFactory.getLogger(WebfingerView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(WebfingerView.class);
private Gson gson = new GsonBuilder()
.setExclusionStrategies(new ExclusionStrategy() {

View File

@ -57,7 +57,10 @@ import com.nimbusds.jose.JWSAlgorithm;
@Controller
public class DiscoveryEndpoint {
private static Logger logger = LoggerFactory.getLogger(DiscoveryEndpoint.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DiscoveryEndpoint.class);
@Autowired
private ConfigurationPropertiesBean config;

View File

@ -39,7 +39,10 @@ import com.google.common.base.Joiner;
@Service
public class DefaultIntrospectionResultAssembler implements IntrospectionResultAssembler {
private static Logger log = LoggerFactory.getLogger(DefaultIntrospectionResultAssembler.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultIntrospectionResultAssembler.class);
@Override
public Map<String, Object> assembleFrom(OAuth2AccessTokenEntity accessToken, UserInfo userInfo) {

View File

@ -61,7 +61,10 @@ import com.google.gson.JsonParser;
@Service
public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEntityService {
private static Logger logger = LoggerFactory.getLogger(DefaultOAuth2ClientDetailsEntityService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultOAuth2ClientDetailsEntityService.class);
@Autowired
private OAuth2ClientRepository clientRepository;

View File

@ -64,7 +64,10 @@ import com.nimbusds.jwt.PlainJWT;
@Service("defaultOAuth2ProviderTokenService")
public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityService {
private static Logger logger = LoggerFactory.getLogger(DefaultOAuth2ProviderTokenService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultOAuth2ProviderTokenService.class);
@Autowired
private OAuth2TokenRepository tokenRepository;

View File

@ -48,7 +48,10 @@ public class TokenApiView extends AbstractView {
public static final String VIEWNAME = "tokenApiView";
private static Logger logger = LoggerFactory.getLogger(JsonEntityView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(TokenApiView.class);
private Gson gson = new GsonBuilder()
.setExclusionStrategies(new ExclusionStrategy() {

View File

@ -63,7 +63,10 @@ public class IntrospectionEndpoint {
@Autowired
private UserInfoService userInfoService;
private static Logger logger = LoggerFactory.getLogger(IntrospectionEndpoint.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(IntrospectionEndpoint.class);
public IntrospectionEndpoint() {

View File

@ -80,7 +80,10 @@ public class OAuthConfirmationController {
@Autowired
private StatsService statsService;
private static Logger logger = LoggerFactory.getLogger(OAuthConfirmationController.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(OAuthConfirmationController.class);
public OAuthConfirmationController() {

View File

@ -40,7 +40,10 @@ public class RevocationEndpoint {
@Autowired
OAuth2TokenEntityService tokenServices;
private static Logger logger = LoggerFactory.getLogger(RevocationEndpoint.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(RevocationEndpoint.class);
@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_CLIENT')")
@RequestMapping("/revoke")

View File

@ -52,7 +52,10 @@ public class ScopeAPI {
@Autowired
private SystemScopeService scopeService;
private static Logger logger = LoggerFactory.getLogger(ScopeAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ScopeAPI.class);
private Gson gson = new Gson();

View File

@ -59,7 +59,10 @@ public class TokenAPI {
@Autowired
private OIDCTokenService oidcTokenService;
private static Logger logger = LoggerFactory.getLogger(TokenAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(TokenAPI.class);
@RequestMapping(value = "/access", method = RequestMethod.GET, produces = "application/json")
public String getAllAccessTokens(ModelMap m, Principal p) {

View File

@ -54,6 +54,9 @@ import com.nimbusds.jwt.SignedJWT;
*/
public class JWTBearerAuthenticationProvider implements AuthenticationProvider {
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JWTBearerAuthenticationProvider.class);
private static final GrantedAuthority ROLE_CLIENT = new SimpleGrantedAuthority("ROLE_CLIENT");

View File

@ -59,8 +59,10 @@ import com.google.common.base.Strings;
@Component("authRequestFilter")
public class AuthorizationRequestFilter extends GenericFilterBean {
private Logger logger = LoggerFactory.getLogger(AuthorizationRequestFilter.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(AuthorizationRequestFilter.class);
public final static String PROMPTED = "PROMPT_FILTER_PROMPTED";
public final static String PROMPT_REQUESTED = "PROMPT_FILTER_REQUESTED";

View File

@ -58,7 +58,10 @@ import com.nimbusds.jwt.SignedJWT;
@Component("connectOAuth2RequestFactory")
public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory {
private static Logger logger = LoggerFactory.getLogger(ConnectOAuth2RequestFactory.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ConnectOAuth2RequestFactory.class);
private ClientDetailsEntityService clientDetailsService;

View File

@ -46,7 +46,10 @@ import com.google.common.collect.Collections2;
@Service("defaultApprovedSiteService")
public class DefaultApprovedSiteService implements ApprovedSiteService {
private static Logger logger = LoggerFactory.getLogger(DefaultApprovedSiteService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultApprovedSiteService.class);
@Autowired
private ApprovedSiteRepository approvedSiteRepository;

View File

@ -68,7 +68,10 @@ import com.nimbusds.jwt.SignedJWT;
@Service
public class DefaultOIDCTokenService implements OIDCTokenService {
Logger logger = LoggerFactory.getLogger(DefaultOIDCTokenService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DefaultOIDCTokenService.class);
@Autowired
private JWTSigningAndValidationService jwtService;

View File

@ -11,6 +11,9 @@ import org.springframework.format.datetime.DateFormatter;
public abstract class MITREidDataServiceSupport {
private final DateFormatter dateFormatter;
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(MITREidDataServiceSupport.class);
public MITREidDataServiceSupport() {

View File

@ -77,7 +77,10 @@ import com.google.gson.stream.JsonWriter;
@SuppressWarnings(value = {"unchecked"})
public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements MITREidDataService {
private final static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_0.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(MITREidDataService_1_0.class);
@Autowired
private OAuth2ClientRepository clientRepository;
@Autowired

View File

@ -80,7 +80,10 @@ import com.google.gson.stream.JsonWriter;
@SuppressWarnings(value = {"unchecked"})
public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements MITREidDataService {
private final static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_1.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(MITREidDataService_1_1.class);
@Autowired
private OAuth2ClientRepository clientRepository;
@Autowired

View File

@ -82,7 +82,10 @@ import com.google.gson.stream.JsonWriter;
@SuppressWarnings(value = {"unchecked"})
public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements MITREidDataService {
private final static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_2.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(MITREidDataService_1_2.class);
@Autowired
private OAuth2ClientRepository clientRepository;
@Autowired

View File

@ -44,7 +44,10 @@ import com.google.common.collect.Iterables;
@Service("uuidPairwiseIdentiferService")
public class UUIDPairwiseIdentiferService implements PairwiseIdentiferService {
private static Logger logger = LoggerFactory.getLogger(UUIDPairwiseIdentiferService.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(UUIDPairwiseIdentiferService.class);
@Autowired
private PairwiseIdentifierRepository pairwiseIdentifierRepository;

View File

@ -49,7 +49,10 @@ import com.nimbusds.jwt.SignedJWT;
@Service
public class ConnectTokenEnhancer implements TokenEnhancer {
Logger logger = LoggerFactory.getLogger(ConnectTokenEnhancer.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ConnectTokenEnhancer.class);
@Autowired
private ConfigurationPropertiesBean configBean;

View File

@ -37,7 +37,10 @@ import com.nimbusds.jose.util.Base64URL;
*/
public class IdTokenHashUtils {
private static Logger logger = LoggerFactory.getLogger(IdTokenHashUtils.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(IdTokenHashUtils.class);
/**
* Compute the SHA hash of an authorization code

View File

@ -54,7 +54,10 @@ import com.google.gson.JsonSerializer;
*
*/
public abstract class AbstractClientEntityView extends AbstractView {
private static Logger logger = LoggerFactory.getLogger(ClientEntityViewForAdmins.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(AbstractClientEntityView.class);
private Gson gson = new GsonBuilder()
.setExclusionStrategies(getExclusionStrategy())

View File

@ -49,7 +49,10 @@ import com.google.gson.JsonObject;
@Component(ClientInformationResponseView.VIEWNAME)
public class ClientInformationResponseView extends AbstractView {
private static Logger logger = LoggerFactory.getLogger(ClientInformationResponseView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ClientInformationResponseView.class);
public static final String VIEWNAME = "clientInformationResponseView";

View File

@ -52,7 +52,10 @@ import com.google.gson.JsonSerializer;
@Component(JsonApprovedSiteView.VIEWNAME)
public class JsonApprovedSiteView extends AbstractView {
private static Logger logger = LoggerFactory.getLogger(JsonApprovedSiteView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JsonApprovedSiteView.class);
public static final String VIEWNAME = "jsonApprovedSiteView";

View File

@ -45,7 +45,10 @@ import com.google.gson.GsonBuilder;
@Component(JsonEntityView.VIEWNAME)
public class JsonEntityView extends AbstractView {
private static Logger logger = LoggerFactory.getLogger(JsonEntityView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JsonEntityView.class);
public static final String VIEWNAME = "jsonEntityView";

View File

@ -44,7 +44,10 @@ import com.google.gson.JsonObject;
@Component(JsonErrorView.VIEWNAME)
public class JsonErrorView extends AbstractView {
private static Logger logger = LoggerFactory.getLogger(JsonEntityView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(JsonErrorView.class);
public static final String VIEWNAME = "jsonErrorView";

View File

@ -59,7 +59,10 @@ import com.nimbusds.jwt.SignedJWT;
@Component(UserInfoJWTView.VIEWNAME)
public class UserInfoJWTView extends UserInfoView {
private static Logger logger = LoggerFactory.getLogger(UserInfoJWTView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(UserInfoJWTView.class);
public static final String VIEWNAME = "userInfoJwtView";

View File

@ -50,7 +50,10 @@ public class UserInfoView extends AbstractView {
public static final String VIEWNAME = "userInfoView";
private static Logger logger = LoggerFactory.getLogger(UserInfoView.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(UserInfoView.class);
@Autowired
private ScopeClaimTranslationService translator;

View File

@ -54,7 +54,10 @@ public class ApprovedSiteAPI {
@Autowired
OAuth2TokenEntityService tokenServices;
private static Logger logger = LoggerFactory.getLogger(ApprovedSiteAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ApprovedSiteAPI.class);
/**
* Get a list of all of this user's approved sites

View File

@ -44,7 +44,10 @@ import org.springframework.stereotype.Component;
@Component("authenticationTimeStamper")
public class AuthenticationTimeStamper extends SavedRequestAwareAuthenticationSuccessHandler {
private static Logger logger = LoggerFactory.getLogger(AuthenticationTimeStamper.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(AuthenticationTimeStamper.class);
public static final String AUTH_TIMESTAMP = "AUTH_TIMESTAMP";

View File

@ -56,7 +56,10 @@ public class BlacklistAPI {
@Autowired
private BlacklistedSiteService blacklistService;
private static Logger logger = LoggerFactory.getLogger(BlacklistAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(BlacklistAPI.class);
private Gson gson = new Gson();
private JsonParser parser = new JsonParser();

View File

@ -108,7 +108,10 @@ public class ClientAPI {
.setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
.create();
private static Logger logger = LoggerFactory.getLogger(ClientAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ClientAPI.class);
/**
* Get a list of all clients

View File

@ -53,7 +53,10 @@ import com.google.gson.stream.JsonWriter;
@PreAuthorize("hasRole('ROLE_ADMIN')") // you need to be an admin to even think about this -- this is a potentially dangerous API!!
public class DataAPI {
private static Logger logger = LoggerFactory.getLogger(DataAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DataAPI.class);
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");

View File

@ -85,7 +85,10 @@ public class DynamicClientRegistrationEndpoint {
@Autowired
private OIDCTokenService connectTokenService;
private static Logger logger = LoggerFactory.getLogger(DynamicClientRegistrationEndpoint.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(DynamicClientRegistrationEndpoint.class);
/**
* Create a new Client, issue a client ID, and create a registration access token.

View File

@ -82,7 +82,10 @@ public class ProtectedResourceRegistrationEndpoint {
@Autowired
private OIDCTokenService connectTokenService;
private static Logger logger = LoggerFactory.getLogger(ProtectedResourceRegistrationEndpoint.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(ProtectedResourceRegistrationEndpoint.class);
/**
* Create a new Client, issue a client ID, and create a registration access token.

View File

@ -56,7 +56,10 @@ public class UserInfoEndpoint {
@Autowired
private ClientDetailsEntityService clientService;
private static Logger logger = LoggerFactory.getLogger(UserInfoEndpoint.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(UserInfoEndpoint.class);
private static final MediaType JOSE_MEDIA_TYPE = new MediaType("application", "jwt");

View File

@ -56,7 +56,10 @@ public class WhitelistAPI {
@Autowired
private WhitelistedSiteService whitelistService;
private static Logger logger = LoggerFactory.getLogger(WhitelistAPI.class);
/**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(WhitelistAPI.class);
private Gson gson = new Gson();
private JsonParser parser = new JsonParser();