From 71bc145ae4f695bf31f47ffa36e3483eeedcefaf Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 23 Jul 2020 15:09:07 -0700 Subject: [PATCH] Remove superfluous comments Use '^\s+//\ \~\ .*$' and '^\s+//\ ============+$' regular expression searches to remove superfluous comments. Prior to this commit, many classes would have comments to indicate blocks of code (such as constructors/methods/instance fields). These added a lot of noise and weren't all that helpful, especially given the outline views available in most modern IDEs. Issue gh-8945 --- .../security/acls/AclEntryVoter.java | 12 ------------ .../afterinvocation/AbstractAclProvider.java | 9 --------- ...rInvocationCollectionFilteringProvider.java | 9 --------- .../AclEntryAfterInvocationProvider.java | 12 ------------ .../acls/afterinvocation/ArrayFilterer.java | 12 ------------ .../afterinvocation/CollectionFilterer.java | 12 ------------ .../acls/afterinvocation/Filterer.java | 3 --- .../acls/domain/AbstractPermission.java | 8 -------- .../acls/domain/AccessControlEntryImpl.java | 9 --------- .../acls/domain/AclAuthorizationStrategy.java | 6 ------ .../domain/AclAuthorizationStrategyImpl.java | 9 --------- .../security/acls/domain/AclImpl.java | 9 --------- .../security/acls/domain/AuditLogger.java | 3 --- .../acls/domain/ConsoleAuditLogger.java | 3 --- .../acls/domain/EhCacheBasedAclCache.java | 9 --------- .../acls/domain/GrantedAuthoritySid.java | 9 --------- .../domain/IdentityUnavailableException.java | 3 --- .../acls/domain/ObjectIdentityImpl.java | 9 --------- .../ObjectIdentityRetrievalStrategyImpl.java | 3 --- .../security/acls/domain/PrincipalSid.java | 9 --------- .../acls/domain/SidRetrievalStrategyImpl.java | 3 --- .../acls/domain/SpringCacheBasedAclCache.java | 9 --------- .../acls/jdbc/BasicLookupStrategy.java | 12 ------------ .../security/acls/jdbc/JdbcAclService.java | 12 ------------ .../acls/jdbc/JdbcMutableAclService.java | 9 --------- .../security/acls/jdbc/LookupStrategy.java | 3 --- .../acls/model/AccessControlEntry.java | 3 --- .../security/acls/model/AclCache.java | 3 --- .../security/acls/model/AclService.java | 3 --- .../acls/model/AlreadyExistsException.java | 3 --- .../model/AuditableAccessControlEntry.java | 3 --- .../security/acls/model/AuditableAcl.java | 3 --- .../acls/model/ChildrenExistException.java | 3 --- .../security/acls/model/MutableAcl.java | 3 --- .../security/acls/model/MutableAclService.java | 3 --- .../security/acls/model/NotFoundException.java | 3 --- .../security/acls/model/ObjectIdentity.java | 3 --- .../model/ObjectIdentityRetrievalStrategy.java | 3 --- .../security/acls/model/OwnershipAcl.java | 3 --- .../security/acls/model/Permission.java | 6 ------ .../security/acls/model/Sid.java | 3 --- .../acls/model/SidRetrievalStrategy.java | 3 --- .../acls/model/UnloadedSidException.java | 3 --- .../security/acls/AclFormattingUtilsTests.java | 2 -- .../domain/AccessControlImplEntryTests.java | 3 --- .../security/acls/domain/AclImplTests.java | 6 ------ .../AclImplementationSecurityCheckTests.java | 3 --- .../security/acls/domain/AuditLoggerTests.java | 5 ----- .../acls/domain/ObjectIdentityImplTests.java | 6 ------ ...jectIdentityRetrievalStrategyImplTests.java | 4 ---- .../jdbc/AbstractBasicLookupStrategyTests.java | 6 ------ .../security/acls/jdbc/DatabaseSeeder.java | 3 --- .../acls/jdbc/JdbcAclServiceTests.java | 3 --- .../acls/jdbc/JdbcMutableAclServiceTests.java | 9 --------- .../acls/sid/SidRetrievalStrategyTests.java | 3 --- .../security/acls/sid/SidTests.java | 2 -- .../security/cas/ServiceProperties.java | 6 ------ .../CasAuthenticationProvider.java | 9 --------- .../authentication/CasAuthenticationToken.java | 8 -------- .../EhCacheBasedTicketCache.java | 9 --------- .../SpringCacheBasedTicketCache.java | 12 ------------ .../authentication/StatelessTicketCache.java | 2 -- .../cas/web/CasAuthenticationEntryPoint.java | 5 ----- .../cas/web/CasAuthenticationFilter.java | 9 --------- .../DefaultServiceAuthenticationDetails.java | 9 --------- .../ServiceAuthenticationDetailsSource.java | 9 --------- .../CasAuthenticationProviderTests.java | 6 ------ .../EhCacheBasedTicketCacheTests.java | 2 -- .../SpringCacheBasedTicketCacheTests.java | 3 --- .../web/CasAuthenticationEntryPointTests.java | 2 -- .../cas/web/CasAuthenticationFilterTests.java | 3 --- .../cas/web/ServicePropertiesTests.java | 3 --- .../security/config/DataSourcePopulator.java | 3 --- .../config/FilterChainProxyConfigTests.java | 3 --- .../security/access/AccessDecisionManager.java | 3 --- .../security/access/AccessDecisionVoter.java | 6 ------ .../security/access/AccessDeniedException.java | 3 --- .../access/AfterInvocationProvider.java | 3 --- .../access/AuthorizationServiceException.java | 3 --- .../security/access/ConfigAttribute.java | 3 --- .../security/access/SecurityConfig.java | 9 --------- .../access/SecurityMetadataSource.java | 3 --- .../event/AbstractAuthorizationEvent.java | 3 --- ...AuthenticationCredentialsNotFoundEvent.java | 9 --------- .../event/AuthorizationFailureEvent.java | 9 --------- .../security/access/event/AuthorizedEvent.java | 9 --------- .../security/access/event/LoggerListener.java | 6 ------ .../access/event/PublicInvocationEvent.java | 3 --- .../intercept/AbstractSecurityInterceptor.java | 9 --------- .../intercept/AfterInvocationManager.java | 3 --- .../AfterInvocationProviderManager.java | 9 --------- .../intercept/InterceptorStatusToken.java | 9 --------- .../MethodInvocationPrivilegeEvaluator.java | 9 --------- .../access/intercept/NullRunAsManager.java | 3 --- .../RunAsImplAuthenticationProvider.java | 6 ------ .../access/intercept/RunAsManager.java | 3 --- .../access/intercept/RunAsManagerImpl.java | 6 ------ .../access/intercept/RunAsUserToken.java | 9 --------- .../aopalliance/MethodSecurityInterceptor.java | 6 ------ .../MethodSecurityMetadataSourceAdvisor.java | 12 ------------ .../intercept/aspectj/AspectJCallback.java | 3 --- .../AbstractMethodSecurityMetadataSource.java | 3 --- ...DelegatingMethodSecurityMetadataSource.java | 9 --------- .../MapBasedMethodSecurityMetadataSource.java | 5 ----- .../vote/AbstractAccessDecisionManager.java | 5 ----- .../security/access/vote/AbstractAclVoter.java | 6 ------ .../security/access/vote/AffirmativeBased.java | 3 --- .../access/vote/AuthenticatedVoter.java | 9 --------- .../security/access/vote/ConsensusBased.java | 6 ------ .../security/access/vote/RoleVoter.java | 6 ------ .../security/access/vote/UnanimousBased.java | 3 --- .../AbstractAuthenticationToken.java | 9 --------- .../AccountExpiredException.java | 3 --- .../AnonymousAuthenticationProvider.java | 6 ------ .../AnonymousAuthenticationToken.java | 9 --------- ...enticationCredentialsNotFoundException.java | 3 --- .../AuthenticationDetailsSource.java | 3 --- .../authentication/AuthenticationManager.java | 3 --- .../authentication/AuthenticationProvider.java | 3 --- .../AuthenticationServiceException.java | 3 --- .../AuthenticationTrustResolver.java | 3 --- .../AuthenticationTrustResolverImpl.java | 6 ------ .../BadCredentialsException.java | 3 --- .../CredentialsExpiredException.java | 3 --- .../authentication/DisabledException.java | 3 --- .../InsufficientAuthenticationException.java | 3 --- .../authentication/LockedException.java | 3 --- .../authentication/ProviderManager.java | 9 --------- .../ProviderNotFoundException.java | 3 --- .../RememberMeAuthenticationProvider.java | 6 ------ .../RememberMeAuthenticationToken.java | 9 --------- .../TestingAuthenticationProvider.java | 3 --- .../TestingAuthenticationToken.java | 9 --------- .../UsernamePasswordAuthenticationToken.java | 9 --------- ...tractUserDetailsAuthenticationProvider.java | 6 ------ .../dao/DaoAuthenticationProvider.java | 9 --------- .../event/AbstractAuthenticationEvent.java | 6 ------ .../AbstractAuthenticationFailureEvent.java | 9 --------- ...thenticationFailureBadCredentialsEvent.java | 3 --- ...ticationFailureCredentialsExpiredEvent.java | 3 --- .../AuthenticationFailureDisabledEvent.java | 3 --- .../AuthenticationFailureExpiredEvent.java | 3 --- .../AuthenticationFailureLockedEvent.java | 3 --- ...enticationFailureProviderNotFoundEvent.java | 3 --- ...thenticationFailureProxyUntrustedEvent.java | 3 --- ...enticationFailureServiceExceptionEvent.java | 3 --- .../event/AuthenticationSuccessEvent.java | 3 --- .../InteractiveAuthenticationSuccessEvent.java | 9 --------- .../authentication/event/LoggerListener.java | 6 ------ .../AbstractJaasAuthenticationProvider.java | 9 --------- .../authentication/jaas/AuthorityGranter.java | 3 --- .../DefaultJaasAuthenticationProvider.java | 6 ------ .../jaas/DefaultLoginExceptionResolver.java | 3 --- .../JaasAuthenticationCallbackHandler.java | 3 --- .../jaas/JaasAuthenticationProvider.java | 9 --------- .../jaas/JaasAuthenticationToken.java | 9 --------- .../jaas/JaasGrantedAuthority.java | 3 --- .../jaas/JaasNameCallbackHandler.java | 3 --- .../jaas/JaasPasswordCallbackHandler.java | 3 --- .../jaas/LoginExceptionResolver.java | 3 --- .../jaas/SecurityContextLoginModule.java | 9 --------- .../jaas/event/JaasAuthenticationEvent.java | 6 ------ .../event/JaasAuthenticationFailedEvent.java | 9 --------- .../event/JaasAuthenticationSuccessEvent.java | 3 --- .../jaas/memory/InMemoryConfiguration.java | 9 --------- .../rcp/RemoteAuthenticationException.java | 3 --- .../rcp/RemoteAuthenticationManager.java | 3 --- .../rcp/RemoteAuthenticationManagerImpl.java | 6 ------ .../rcp/RemoteAuthenticationProvider.java | 6 ------ .../security/core/Authentication.java | 3 --- .../security/core/AuthenticationException.java | 3 --- .../security/core/GrantedAuthority.java | 3 --- .../core/SpringSecurityMessageSource.java | 6 ------ .../GlobalSecurityContextHolderStrategy.java | 6 ------ ...readLocalSecurityContextHolderStrategy.java | 6 ------ .../security/core/context/SecurityContext.java | 3 --- .../core/context/SecurityContextHolder.java | 6 ------ .../context/SecurityContextHolderStrategy.java | 3 --- .../core/context/SecurityContextImpl.java | 6 ------ ...readLocalSecurityContextHolderStrategy.java | 6 ------ .../core/session/SessionInformation.java | 9 --------- .../security/core/session/SessionRegistry.java | 3 --- .../core/session/SessionRegistryImpl.java | 6 ------ .../security/core/userdetails/User.java | 8 -------- .../security/core/userdetails/UserCache.java | 3 --- .../security/core/userdetails/UserDetails.java | 3 --- .../core/userdetails/UserDetailsService.java | 3 --- .../userdetails/UsernameNotFoundException.java | 3 --- .../cache/EhCacheBasedUserCache.java | 9 --------- .../core/userdetails/cache/NullUserCache.java | 3 --- .../cache/SpringCacheBasedUserCache.java | 12 ------------ .../core/userdetails/jdbc/JdbcDaoImpl.java | 12 ------------ .../core/userdetails/memory/UserAttribute.java | 6 ------ .../memory/UserAttributeEditor.java | 3 --- .../provisioning/JdbcUserDetailsManager.java | 15 --------------- .../security/util/FieldUtils.java | 2 -- .../security/util/InMemoryResource.java | 9 --------- .../security/util/MethodInvocationUtils.java | 3 --- .../security/util/SimpleMethodInvocation.java | 9 --------- .../security/ITargetObject.java | 3 --- .../security/OtherTargetObject.java | 3 --- .../security/PopulatedDatabase.java | 9 --------- .../springframework/security/TargetObject.java | 3 --- .../security/access/SecurityConfigTests.java | 6 ------ .../access/annotation/BusinessService.java | 3 --- ...sr250MethodSecurityMetadataSourceTests.java | 3 --- ...dAnnotationSecurityMetadataSourceTests.java | 6 ------ .../method/MethodExpressionVoterTests.java | 3 --- ...tAnnotationSecurityMetadataSourceTests.java | 3 --- .../AbstractSecurityInterceptorTests.java | 6 ------ .../AfterInvocationProviderManagerTests.java | 5 ----- .../intercept/NullRunAsManagerTests.java | 3 --- .../MethodSecurityInterceptorTests.java | 3 --- ...thodSecurityMetadataSourceAdvisorTests.java | 2 -- .../AspectJMethodSecurityInterceptorTests.java | 3 --- ...ethodInvocationPrivilegeEvaluatorTests.java | 3 --- .../AbstractAccessDecisionManagerTests.java | 5 ----- .../security/access/vote/DenyAgainVoter.java | 3 --- .../security/access/vote/DenyVoter.java | 3 --- .../security/access/vote/SomeDomainObject.java | 9 --------- .../access/vote/SomeDomainObjectManager.java | 3 --- .../access/vote/UnanimousBasedTests.java | 3 --- .../AbstractAuthenticationTokenTests.java | 9 --------- .../AuthenticationTrustResolverImplTests.java | 2 -- .../authentication/ProviderManagerTests.java | 3 --- ...ernamePasswordAuthenticationTokenTests.java | 3 --- .../AnonymousAuthenticationProviderTests.java | 3 --- .../AnonymousAuthenticationTokenTests.java | 2 -- .../dao/DaoAuthenticationProviderTests.java | 5 ----- .../event/AuthenticationEventTests.java | 3 --- .../event/LoggerListenerTests.java | 3 --- .../jaas/JaasAuthenticationProviderTests.java | 9 --------- .../authentication/jaas/JaasEventCheck.java | 6 ------ .../jaas/SecurityContextLoginModuleTests.java | 6 ------ .../jaas/TestAuthorityGranter.java | 3 --- .../jaas/TestCallbackHandler.java | 3 --- .../authentication/jaas/TestLoginModule.java | 6 ------ .../RemoteAuthenticationManagerImplTests.java | 3 --- .../rcp/RemoteAuthenticationProviderTests.java | 6 ------ .../RememberMeAuthenticationProviderTests.java | 2 -- .../RememberMeAuthenticationTokenTests.java | 2 -- .../core/SpringSecurityMessageSourceTests.java | 2 -- .../context/SecurityContextHolderTests.java | 2 -- .../core/context/SecurityContextImplTests.java | 2 -- .../core/session/SessionInformationTests.java | 2 -- .../core/session/SessionRegistryImplTests.java | 3 --- .../security/core/userdetails/UserTests.java | 3 --- .../cache/EhCacheBasedUserCacheTests.java | 2 -- .../userdetails/cache/NullUserCacheTests.java | 3 --- .../cache/SpringCacheBasedUserCacheTests.java | 2 -- .../userdetails/jdbc/JdbcDaoImplTests.java | 3 --- .../password/LdapShaPasswordEncoder.java | 11 ----------- .../password/LdapShaPasswordEncoderTests.java | 6 ------ .../MessageDigestPasswordEncoderTests.java | 3 --- .../ldap/SpringSecurityLdapTemplateITests.java | 6 ------ .../authentication/BindAuthenticatorTests.java | 6 ------ .../PasswordComparisonAuthenticatorTests.java | 6 ------ .../DefaultLdapAuthoritiesPopulatorTests.java | 3 --- .../NestedLdapAuthoritiesPopulatorTests.java | 3 --- .../security/ldap/LdapUtils.java | 9 --------- .../ldap/SpringSecurityLdapTemplate.java | 11 ----------- .../AbstractLdapAuthenticator.java | 9 --------- .../ldap/authentication/BindAuthenticator.java | 9 --------- .../LdapAuthenticationProvider.java | 9 --------- .../ldap/authentication/LdapAuthenticator.java | 3 --- .../PasswordComparisonAuthenticator.java | 12 ------------ .../ldap/ppolicy/PasswordPolicyControl.java | 12 ------------ .../ppolicy/PasswordPolicyControlFactory.java | 3 --- .../ppolicy/PasswordPolicyResponseControl.java | 18 ------------------ .../ldap/search/FilterBasedLdapUserSearch.java | 12 ------------ .../security/ldap/search/LdapUserSearch.java | 3 --- .../DefaultLdapAuthoritiesPopulator.java | 12 ------------ .../userdetails/LdapAuthoritiesPopulator.java | 3 --- .../ldap/userdetails/LdapUserDetails.java | 3 --- .../ldap/userdetails/LdapUserDetailsImpl.java | 12 ------------ .../userdetails/LdapUserDetailsMapper.java | 6 ------ .../security/ldap/LdapUtilsTests.java | 3 --- .../LdapAuthenticationProviderTests.java | 6 ------ .../ldap/authentication/MockUserSearch.java | 9 --------- ...sswordComparisonAuthenticatorMockTests.java | 3 --- .../PasswordPolicyResponseControlTests.java | 3 --- .../AuthenticationCancelledException.java | 3 --- .../security/openid/OpenID4JavaConsumer.java | 9 --------- .../openid/OpenIDAuthenticationFilter.java | 12 ------------ .../openid/OpenIDAuthenticationProvider.java | 6 ------ .../openid/OpenIDAuthenticationStatus.java | 3 --- .../openid/OpenIDAuthenticationToken.java | 9 --------- .../openid/OpenIDConsumerException.java | 3 --- .../security/openid/MockOpenIDConsumer.java | 6 ------ .../OpenIDAuthenticationProviderTests.java | 6 ------ ...cationSimpleHttpInvokerRequestExecutor.java | 9 --------- .../ContextPropagatingRemoteInvocation.java | 9 --------- ...textPropagatingRemoteInvocationFactory.java | 3 --- ...nSimpleHttpInvokerRequestExecutorTests.java | 5 ----- ...ontextPropagatingRemoteInvocationTests.java | 2 -- .../java/sample/contact/AddPermission.java | 5 +---- .../sample/contact/AddPermissionValidator.java | 3 +-- .../java/sample/contact/ClientApplication.java | 7 +------ .../src/main/java/sample/contact/Contact.java | 7 +------ .../main/java/sample/contact/ContactDao.java | 3 +-- .../java/sample/contact/ContactDaoSpring.java | 2 -- .../java/sample/contact/ContactManager.java | 3 +-- .../sample/contact/ContactManagerBackend.java | 5 +---- .../sample/contact/DataSourcePopulator.java | 5 +---- .../java/sample/contact/IndexController.java | 4 ---- .../main/java/sample/contact/WebContact.java | 5 +---- .../sample/contact/WebContactValidator.java | 3 +-- .../sample/contact/ContactManagerTests.java | 5 +---- .../UsernameEqualsPasswordLoginModule.java | 5 +---- .../taglibs/authz/AccessControlListTag.java | 9 --------- .../taglibs/authz/AuthenticationTag.java | 6 ------ .../taglibs/authz/AuthenticationTagTests.java | 9 --------- .../taglibs/authz/AuthorizeTagTests.java | 6 ------ .../security/web/AuthenticationEntryPoint.java | 3 --- .../security/web/FilterChainProxy.java | 12 ------------ .../security/web/FilterInvocation.java | 11 ----------- .../security/web/PortMapper.java | 3 --- .../security/web/PortMapperImpl.java | 9 --------- .../security/web/PortResolver.java | 3 --- .../security/web/PortResolverImpl.java | 6 ------ .../web/access/AccessDeniedHandler.java | 3 --- .../web/access/AccessDeniedHandlerImpl.java | 9 --------- ...DefaultWebInvocationPrivilegeEvaluator.java | 12 ------------ .../web/access/ExceptionTranslationFilter.java | 6 ------ .../channel/AbstractRetryEntryPoint.java | 11 ----------- .../access/channel/ChannelDecisionManager.java | 3 --- .../channel/ChannelDecisionManagerImpl.java | 6 ------ .../web/access/channel/ChannelEntryPoint.java | 3 --- .../channel/ChannelProcessingFilter.java | 6 ------ .../web/access/channel/ChannelProcessor.java | 3 --- .../channel/InsecureChannelProcessor.java | 6 ------ .../access/channel/SecureChannelProcessor.java | 6 ------ ...FilterInvocationSecurityMetadataSource.java | 6 ------ .../intercept/FilterSecurityInterceptor.java | 9 --------- ...AbstractAuthenticationProcessingFilter.java | 12 ------------ .../AnonymousAuthenticationFilter.java | 6 ------ .../LoginUrlAuthenticationEntryPoint.java | 9 --------- .../authentication/NullRememberMeServices.java | 3 --- .../web/authentication/RememberMeServices.java | 3 --- .../UsernamePasswordAuthenticationFilter.java | 9 --------- .../WebAuthenticationDetails.java | 9 --------- .../WebAuthenticationDetailsSource.java | 3 --- .../authentication/logout/LogoutFilter.java | 9 --------- .../authentication/logout/LogoutHandler.java | 3 --- .../logout/SecurityContextLogoutHandler.java | 3 --- .../x509/SubjectDnX509PrincipalExtractor.java | 2 -- .../rememberme/AbstractRememberMeServices.java | 5 ----- .../rememberme/JdbcTokenRepositoryImpl.java | 6 ------ .../RememberMeAuthenticationException.java | 3 --- .../RememberMeAuthenticationFilter.java | 6 ------ .../TokenBasedRememberMeServices.java | 3 --- .../SessionFixationProtectionEvent.java | 9 --------- .../AuthenticationSwitchUserEvent.java | 9 --------- .../switchuser/SwitchUserFilter.java | 9 --------- .../switchuser/SwitchUserGrantedAuthority.java | 8 -------- .../www/BasicAuthenticationEntryPoint.java | 6 ------ .../www/BasicAuthenticationFilter.java | 6 ------ .../www/DigestAuthenticationEntryPoint.java | 9 --------- .../www/DigestAuthenticationFilter.java | 9 --------- .../www/NonceExpiredException.java | 3 --- .../HttpSessionSecurityContextRepository.java | 3 --- .../web/firewall/RequestRejectedHandler.java | 3 --- .../web/jaasapi/JaasApiIntegrationFilter.java | 6 ------ .../web/savedrequest/DefaultSavedRequest.java | 12 ------------ .../security/web/savedrequest/Enumerator.java | 9 --------- .../web/savedrequest/FastHttpDateFormat.java | 6 ------ .../savedrequest/SavedRequestAwareWrapper.java | 12 ------------ ...ecurityContextHolderAwareRequestFilter.java | 6 ------ ...curityContextHolderAwareRequestWrapper.java | 9 --------- .../web/session/ConcurrentSessionFilter.java | 6 ------ .../web/session/HttpSessionCreatedEvent.java | 3 --- .../web/session/HttpSessionDestroyedEvent.java | 3 --- .../web/session/HttpSessionEventPublisher.java | 6 ------ .../web/session/SessionManagementFilter.java | 6 ------ .../security/web/util/UrlUtils.java | 3 --- .../security/MockFilterConfig.java | 5 ----- .../security/MockPortResolver.java | 9 --------- .../security/web/FilterInvocationTests.java | 3 --- .../security/web/PortMapperImplTests.java | 2 -- .../security/web/PortResolverImplTests.java | 2 -- ...ltWebInvocationPrivilegeEvaluatorTests.java | 3 --- .../ChannelDecisionManagerImplTests.java | 5 ----- .../channel/ChannelProcessingFilterTests.java | 6 ------ .../channel/RetryWithHttpEntryPointTests.java | 2 -- .../channel/RetryWithHttpsEntryPointTests.java | 2 -- .../channel/SecureChannelProcessorTests.java | 2 -- ...rInvocationSecurityMetadataSourceTests.java | 2 -- .../FilterSecurityInterceptorTests.java | 3 --- ...actAuthenticationProcessingFilterTests.java | 6 ------ .../AnonymousAuthenticationFilterTests.java | 6 ------ .../LoginUrlAuthenticationEntryPointTests.java | 3 --- ...rnamePasswordAuthenticationFilterTests.java | 3 --- .../preauth/x509/X509TestUtils.java | 3 --- .../AbstractRememberMeServicesTests.java | 3 --- .../NullRememberMeServicesTests.java | 2 -- .../RememberMeAuthenticationFilterTests.java | 6 ------ .../TokenBasedRememberMeServicesTests.java | 3 --- .../switchuser/SwitchUserFilterTests.java | 2 -- .../www/BasicAuthenticationFilterTests.java | 6 ------ .../www/DigestAuthUtilsTests.java | 5 ----- .../DigestAuthenticationEntryPointTests.java | 3 --- .../www/DigestAuthenticationFilterTests.java | 9 --------- .../jaasapi/JaasApiIntegrationFilterTests.java | 8 -------- ...tyContextHolderAwareRequestFilterTests.java | 3 --- .../HttpSessionEventPublisherTests.java | 3 --- .../web/session/MockApplicationListener.java | 6 ------ 406 files changed, 12 insertions(+), 2190 deletions(-) diff --git a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java index 80f38fd296..97c722080e 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java +++ b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java @@ -96,14 +96,8 @@ import org.springframework.util.StringUtils; */ public class AclEntryVoter extends AbstractAclVoter { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(AclEntryVoter.class); - // ~ Instance fields - // ================================================================================================ - private AclService aclService; private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl(); @@ -116,9 +110,6 @@ public class AclEntryVoter extends AbstractAclVoter { private List requirePermission; - // ~ Constructors - // =================================================================================================== - public AclEntryVoter(AclService aclService, String processConfigAttribute, Permission[] requirePermission) { Assert.notNull(processConfigAttribute, "A processConfigAttribute is mandatory"); Assert.notNull(aclService, "An AclService is mandatory"); @@ -132,9 +123,6 @@ public class AclEntryVoter extends AbstractAclVoter { this.requirePermission = Arrays.asList(requirePermission); } - // ~ Methods - // ======================================================================================================== - /** * Optionally specifies a method of the domain object that will be used to obtain a * contained domain object. That contained domain object will be used for the ACL diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java index 96956db09b..da4a3464f1 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java @@ -41,9 +41,6 @@ import org.springframework.util.Assert; */ public abstract class AbstractAclProvider implements AfterInvocationProvider { - // ~ Instance fields - // ================================================================================================ - protected final AclService aclService; protected Class processDomainObjectClass = Object.class; @@ -56,9 +53,6 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider { protected final List requirePermission; - // ~ Constructors - // =================================================================================================== - public AbstractAclProvider(AclService aclService, String processConfigAttribute, List requirePermission) { Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory"); @@ -73,9 +67,6 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider { this.requirePermission = requirePermission; } - // ~ Methods - // ======================================================================================================== - protected Class getProcessDomainObjectClass() { return processDomainObjectClass; } diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java index bf73dc8c70..15c55da2bd 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java @@ -62,22 +62,13 @@ import org.springframework.security.core.Authentication; */ public class AclEntryAfterInvocationCollectionFilteringProvider extends AbstractAclProvider { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationCollectionFilteringProvider.class); - // ~ Constructors - // =================================================================================================== - public AclEntryAfterInvocationCollectionFilteringProvider(AclService aclService, List requirePermission) { super(aclService, "AFTER_ACL_COLLECTION_READ", requirePermission); } - // ~ Methods - // ======================================================================================================== - @SuppressWarnings("unchecked") public Object decide(Authentication authentication, Object object, Collection config, Object returnedObject) throws AccessDeniedException { diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java index f816868e6d..9d71753665 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java @@ -60,19 +60,10 @@ import org.springframework.security.core.SpringSecurityMessageSource; */ public class AclEntryAfterInvocationProvider extends AbstractAclProvider implements MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationProvider.class); - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); - // ~ Constructors - // =================================================================================================== - public AclEntryAfterInvocationProvider(AclService aclService, List requirePermission) { this(aclService, "AFTER_ACL_READ", requirePermission); } @@ -82,9 +73,6 @@ public class AclEntryAfterInvocationProvider extends AbstractAclProvider impleme super(aclService, processConfigAttribute, requirePermission); } - // ~ Methods - // ======================================================================================================== - public Object decide(Authentication authentication, Object object, Collection config, Object returnedObject) throws AccessDeniedException { diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java index ed7e8031a7..c908ef52aa 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java @@ -33,21 +33,12 @@ import org.apache.commons.logging.LogFactory; */ class ArrayFilterer implements Filterer { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(ArrayFilterer.class); - // ~ Instance fields - // ================================================================================================ - private final Set removeList; private final T[] list; - // ~ Constructors - // =================================================================================================== - ArrayFilterer(T[] list) { this.list = list; @@ -57,9 +48,6 @@ class ArrayFilterer implements Filterer { removeList = new HashSet<>(); } - // ~ Methods - // ======================================================================================================== - /** * * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject() diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java index 9d5fb816d7..0652c9ba73 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java @@ -32,21 +32,12 @@ import java.util.Set; */ class CollectionFilterer implements Filterer { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(CollectionFilterer.class); - // ~ Instance fields - // ================================================================================================ - private final Collection collection; private final Set removeList; - // ~ Constructors - // =================================================================================================== - CollectionFilterer(Collection collection) { this.collection = collection; @@ -60,9 +51,6 @@ class CollectionFilterer implements Filterer { removeList = new HashSet<>(); } - // ~ Methods - // ======================================================================================================== - /** * * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject() diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java index 019e206731..8632d426a1 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java @@ -26,9 +26,6 @@ import java.util.Iterator; */ interface Filterer extends Iterable { - // ~ Methods - // ======================================================================================================== - /** * Gets the filtered collection or array. * @return the filtered collection or array diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java index 9afd5a22c3..ff5d8fd9a9 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java @@ -25,15 +25,10 @@ import org.springframework.security.acls.model.Permission; */ public abstract class AbstractPermission implements Permission { - // ~ Instance fields - // ================================================================================================ - protected final char code; protected int mask; - // ~ Constructors - // =================================================================================================== /** * Sets the permission mask and uses the '*' character to represent active bits when * represented as a bit pattern string. @@ -55,9 +50,6 @@ public abstract class AbstractPermission implements Permission { this.code = code; } - // ~ Methods - // ======================================================================================================== - public final boolean equals(Object arg0) { if (arg0 == null) { return false; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java index c6702efa94..995a04b375 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java @@ -32,9 +32,6 @@ import java.io.Serializable; */ public class AccessControlEntryImpl implements AccessControlEntry, AuditableAccessControlEntry { - // ~ Instance fields - // ================================================================================================ - private final Acl acl; private Permission permission; @@ -49,9 +46,6 @@ public class AccessControlEntryImpl implements AccessControlEntry, AuditableAcce private final boolean granting; - // ~ Constructors - // =================================================================================================== - public AccessControlEntryImpl(Serializable id, Acl acl, Sid sid, Permission permission, boolean granting, boolean auditSuccess, boolean auditFailure) { Assert.notNull(acl, "Acl required"); @@ -66,9 +60,6 @@ public class AccessControlEntryImpl implements AccessControlEntry, AuditableAcce this.auditFailure = auditFailure; } - // ~ Methods - // ======================================================================================================== - @Override public boolean equals(Object arg0) { if (!(arg0 instanceof AccessControlEntryImpl)) { diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java index 5c94ab46cc..fa243b0fcf 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java @@ -26,18 +26,12 @@ import org.springframework.security.acls.model.Acl; */ public interface AclAuthorizationStrategy { - // ~ Static fields/initializers - // ===================================================================================== - int CHANGE_OWNERSHIP = 0; int CHANGE_AUDITING = 1; int CHANGE_GENERAL = 2; - // ~ Methods - // ======================================================================================================== - void securityCheck(Acl acl, int changeType); } diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java index 2ad9004121..e899245736 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java @@ -46,9 +46,6 @@ import java.util.Set; */ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy { - // ~ Instance fields - // ================================================================================================ - private final GrantedAuthority gaGeneralChanges; private final GrantedAuthority gaModifyAuditing; @@ -57,9 +54,6 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy { private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl(); - // ~ Constructors - // =================================================================================================== - /** * Constructor. The only mandatory parameter relates to the system-wide * {@link GrantedAuthority} instances that can be held to always permit ACL changes. @@ -83,9 +77,6 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy { } } - // ~ Methods - // ======================================================================================================== - public void securityCheck(Acl acl, int changeType) { if ((SecurityContextHolder.getContext() == null) || (SecurityContextHolder.getContext().getAuthentication() == null) diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java index c5860b233a..a5493ca43d 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java @@ -39,9 +39,6 @@ import org.springframework.util.Assert; */ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { - // ~ Instance fields - // ================================================================================================ - private Acl parentAcl; private transient AclAuthorizationStrategy aclAuthorizationStrategy; @@ -61,9 +58,6 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { private boolean entriesInheriting = true; - // ~ Constructors - // =================================================================================================== - /** * Minimal constructor, which should be used * {@link org.springframework.security.acls.model.MutableAclService#createAcl(ObjectIdentity)} @@ -125,9 +119,6 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { private AclImpl() { } - // ~ Methods - // ======================================================================================================== - @Override public void deleteAce(int aceIndex) throws NotFoundException { aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java b/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java index 4c08537e07..2caf8fceb1 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java @@ -25,9 +25,6 @@ import org.springframework.security.acls.model.AccessControlEntry; */ public interface AuditLogger { - // ~ Methods - // ======================================================================================================== - void logIfNeeded(boolean granted, AccessControlEntry ace); } diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java b/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java index f4eaaeb8da..b205b3b10f 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java @@ -27,9 +27,6 @@ import org.springframework.util.Assert; */ public class ConsoleAuditLogger implements AuditLogger { - // ~ Methods - // ======================================================================================================== - public void logIfNeeded(boolean granted, AccessControlEntry ace) { Assert.notNull(ace, "AccessControlEntry required"); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java index 2d5a3cb779..2091760b3a 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java @@ -39,18 +39,12 @@ import org.springframework.util.Assert; */ public class EhCacheBasedAclCache implements AclCache { - // ~ Instance fields - // ================================================================================================ - private final Ehcache cache; private PermissionGrantingStrategy permissionGrantingStrategy; private AclAuthorizationStrategy aclAuthorizationStrategy; - // ~ Constructors - // =================================================================================================== - public EhCacheBasedAclCache(Ehcache cache, PermissionGrantingStrategy permissionGrantingStrategy, AclAuthorizationStrategy aclAuthorizationStrategy) { Assert.notNull(cache, "Cache required"); @@ -61,9 +55,6 @@ public class EhCacheBasedAclCache implements AclCache { this.aclAuthorizationStrategy = aclAuthorizationStrategy; } - // ~ Methods - // ======================================================================================================== - public void evictFromCache(Serializable pk) { Assert.notNull(pk, "Primary key (identifier) required"); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java index 16155f03ee..692351904f 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java @@ -32,14 +32,8 @@ import org.springframework.util.Assert; */ public class GrantedAuthoritySid implements Sid { - // ~ Instance fields - // ================================================================================================ - private final String grantedAuthority; - // ~ Constructors - // =================================================================================================== - public GrantedAuthoritySid(String grantedAuthority) { Assert.hasText(grantedAuthority, "GrantedAuthority required"); this.grantedAuthority = grantedAuthority; @@ -52,9 +46,6 @@ public class GrantedAuthoritySid implements Sid { this.grantedAuthority = grantedAuthority.getAuthority(); } - // ~ Methods - // ======================================================================================================== - @Override public boolean equals(Object object) { if ((object == null) || !(object instanceof GrantedAuthoritySid)) { diff --git a/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java b/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java index 9b1f2dc933..872b36bbf1 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java @@ -22,9 +22,6 @@ package org.springframework.security.acls.domain; */ public class IdentityUnavailableException extends RuntimeException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an IdentityUnavailableException with the specified message. * @param msg the detail message diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java index 249a8b37ce..bfc975f355 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java @@ -32,16 +32,10 @@ import org.springframework.util.ClassUtils; */ public class ObjectIdentityImpl implements ObjectIdentity { - // ~ Instance fields - // ================================================================================================ - private final String type; private Serializable identifier; - // ~ Constructors - // =================================================================================================== - public ObjectIdentityImpl(String type, Serializable identifier) { Assert.hasText(type, "Type required"); Assert.notNull(identifier, "identifier required"); @@ -92,9 +86,6 @@ public class ObjectIdentityImpl implements ObjectIdentity { this.identifier = (Serializable) result; } - // ~ Methods - // ======================================================================================================== - /** * Important so caching operates properly. *

diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java index a789719b94..252a9334a9 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java @@ -31,9 +31,6 @@ import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy; */ public class ObjectIdentityRetrievalStrategyImpl implements ObjectIdentityRetrievalStrategy, ObjectIdentityGenerator { - // ~ Methods - // ======================================================================================================== - public ObjectIdentity getObjectIdentity(Object domainObject) { return new ObjectIdentityImpl(domainObject); } diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java index 5f89653a1d..59e1b64840 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java @@ -32,14 +32,8 @@ import org.springframework.util.Assert; */ public class PrincipalSid implements Sid { - // ~ Instance fields - // ================================================================================================ - private final String principal; - // ~ Constructors - // =================================================================================================== - public PrincipalSid(String principal) { Assert.hasText(principal, "Principal required"); this.principal = principal; @@ -52,9 +46,6 @@ public class PrincipalSid implements Sid { this.principal = authentication.getName(); } - // ~ Methods - // ======================================================================================================== - @Override public boolean equals(Object object) { if ((object == null) || !(object instanceof PrincipalSid)) { diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java index d5611c505b..10df1af2d0 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java @@ -51,9 +51,6 @@ public class SidRetrievalStrategyImpl implements SidRetrievalStrategy { this.roleHierarchy = roleHierarchy; } - // ~ Methods - // ======================================================================================================== - public List getSids(Authentication authentication) { Collection authorities = roleHierarchy .getReachableGrantedAuthorities(authentication.getAuthorities()); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java index d14c3c85f5..6619077c8c 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java @@ -40,18 +40,12 @@ import java.io.Serializable; */ public class SpringCacheBasedAclCache implements AclCache { - // ~ Instance fields - // ================================================================================================ - private final Cache cache; private PermissionGrantingStrategy permissionGrantingStrategy; private AclAuthorizationStrategy aclAuthorizationStrategy; - // ~ Constructors - // =================================================================================================== - public SpringCacheBasedAclCache(Cache cache, PermissionGrantingStrategy permissionGrantingStrategy, AclAuthorizationStrategy aclAuthorizationStrategy) { Assert.notNull(cache, "Cache required"); @@ -62,9 +56,6 @@ public class SpringCacheBasedAclCache implements AclCache { this.aclAuthorizationStrategy = aclAuthorizationStrategy; } - // ~ Methods - // ======================================================================================================== - public void evictFromCache(Serializable pk) { Assert.notNull(pk, "Primary key (identifier) required"); diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index 6cad36f01a..326b2f2c76 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -105,9 +105,6 @@ public class BasicLookupStrategy implements LookupStrategy { public final static String DEFAULT_ORDER_BY_CLAUSE = ") order by acl_object_identity.object_id_identity" + " asc, acl_entry.ace_order asc"; - // ~ Instance fields - // ================================================================================================ - private final AclAuthorizationStrategy aclAuthorizationStrategy; private PermissionFactory permissionFactory = new DefaultPermissionFactory(); @@ -135,9 +132,6 @@ public class BasicLookupStrategy implements LookupStrategy { private AclClassIdUtils aclClassIdUtils; - // ~ Constructors - // =================================================================================================== - /** * Constructor accepting mandatory arguments * @param dataSource to access the database @@ -171,9 +165,6 @@ public class BasicLookupStrategy implements LookupStrategy { fieldAcl.setAccessible(true); } - // ~ Methods - // ======================================================================================================== - private String computeRepeatingSql(String repeatingSql, int requiredRepetitions) { assert requiredRepetitions > 0 : "requiredRepetitions must be > 0"; @@ -530,9 +521,6 @@ public class BasicLookupStrategy implements LookupStrategy { this.aclClassIdUtils = new AclClassIdUtils(conversionService); } - // ~ Inner Classes - // ================================================================================================== - private class ProcessResultSet implements ResultSetExtractor> { private final Map acls; diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java index 2286bac911..8c531e353b 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java @@ -46,9 +46,6 @@ import org.springframework.util.Assert; */ public class JdbcAclService implements AclService { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log log = LogFactory.getLog(JdbcAclService.class); private static final String DEFAULT_SELECT_ACL_CLASS_COLUMNS = "class.class as class"; @@ -70,9 +67,6 @@ public class JdbcAclService implements AclService { + "and parent.object_id_identity = ? and parent.object_id_class = (" + "select id FROM acl_class where acl_class.class = ?)"; - // ~ Instance fields - // ================================================================================================ - protected final JdbcOperations jdbcOperations; private final LookupStrategy lookupStrategy; @@ -83,9 +77,6 @@ public class JdbcAclService implements AclService { private AclClassIdUtils aclClassIdUtils; - // ~ Constructors - // =================================================================================================== - public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) { this(new JdbcTemplate(dataSource), lookupStrategy); } @@ -98,9 +89,6 @@ public class JdbcAclService implements AclService { this.aclClassIdUtils = new AclClassIdUtils(); } - // ~ Methods - // ======================================================================================================== - public List findChildren(ObjectIdentity parentIdentity) { Object[] args = { parentIdentity.getIdentifier().toString(), parentIdentity.getType() }; List objects = jdbcOperations.query(findChildrenSql, args, (rs, rowNum) -> { diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java index 3654dc7f3f..88271c7ec1 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java @@ -63,9 +63,6 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS private static final String DEFAULT_INSERT_INTO_ACL_CLASS_WITH_ID = "insert into acl_class (class, class_id_type) values (?, ?)"; - // ~ Instance fields - // ================================================================================================ - private boolean foreignKeysInDatabase = true; private final AclCache aclCache; @@ -100,18 +97,12 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS private String updateObjectIdentity = "update acl_object_identity set " + "parent_object = ?, owner_sid = ?, entries_inheriting = ?" + " where id = ?"; - // ~ Constructors - // =================================================================================================== - public JdbcMutableAclService(DataSource dataSource, LookupStrategy lookupStrategy, AclCache aclCache) { super(dataSource, lookupStrategy); Assert.notNull(aclCache, "AclCache required"); this.aclCache = aclCache; } - // ~ Methods - // ======================================================================================================== - public MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException { Assert.notNull(objectIdentity, "Object Identity required"); diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java index 98243dda75..592bf4f38b 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java @@ -30,9 +30,6 @@ import java.util.Map; */ public interface LookupStrategy { - // ~ Methods - // ======================================================================================================== - /** * Perform database-specific optimized lookup. * @param objects the identities to lookup (required) diff --git a/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java b/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java index b0241f0b78..bc65718372 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java @@ -30,9 +30,6 @@ import java.io.Serializable; */ public interface AccessControlEntry extends Serializable { - // ~ Methods - // ======================================================================================================== - Acl getAcl(); /** diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclCache.java b/acl/src/main/java/org/springframework/security/acls/model/AclCache.java index 85df6e14ea..d2dd0a33d4 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AclCache.java @@ -27,9 +27,6 @@ import java.io.Serializable; */ public interface AclCache { - // ~ Methods - // ======================================================================================================== - void evictFromCache(Serializable pk); void evictFromCache(ObjectIdentity objectIdentity); diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclService.java b/acl/src/main/java/org/springframework/security/acls/model/AclService.java index b0df3f0cd8..2220f04fbb 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AclService.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AclService.java @@ -25,9 +25,6 @@ import java.util.Map; */ public interface AclService { - // ~ Methods - // ======================================================================================================== - /** * Locates all object identities that use the specified parent. This is useful for * administration tools. diff --git a/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java b/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java index d0d7818e60..1646f53e0b 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java @@ -22,9 +22,6 @@ package org.springframework.security.acls.model; */ public class AlreadyExistsException extends AclDataAccessException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an AlreadyExistsException with the specified message. * @param msg the detail message diff --git a/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java b/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java index 1790e38276..2f541427e0 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java @@ -23,9 +23,6 @@ package org.springframework.security.acls.model; */ public interface AuditableAccessControlEntry extends AccessControlEntry { - // ~ Methods - // ======================================================================================================== - boolean isAuditFailure(); boolean isAuditSuccess(); diff --git a/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java b/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java index 9311aac46e..19e224afc0 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java @@ -23,9 +23,6 @@ package org.springframework.security.acls.model; */ public interface AuditableAcl extends MutableAcl { - // ~ Methods - // ======================================================================================================== - void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure); } diff --git a/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java b/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java index d127e8523f..679112393c 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java @@ -22,9 +22,6 @@ package org.springframework.security.acls.model; */ public class ChildrenExistException extends AclDataAccessException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an ChildrenExistException with the specified message. * @param msg the detail message diff --git a/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java b/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java index 717824b513..0b813a67ba 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java @@ -27,9 +27,6 @@ import java.io.Serializable; */ public interface MutableAcl extends Acl { - // ~ Methods - // ======================================================================================================== - void deleteAce(int aceIndex) throws NotFoundException; /** diff --git a/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java b/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java index 0c1536529a..6892f91f53 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java @@ -22,9 +22,6 @@ package org.springframework.security.acls.model; */ public interface MutableAclService extends AclService { - // ~ Methods - // ======================================================================================================== - /** * Creates an empty Acl object in the database. It will have no entries. * The returned object will then be used to add entries. diff --git a/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java b/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java index 7e1450dedf..a77e252126 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java @@ -22,9 +22,6 @@ package org.springframework.security.acls.model; */ public class NotFoundException extends AclDataAccessException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an NotFoundException with the specified message. * @param msg the detail message diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java index 5e5d9d8e37..dc940a337a 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java @@ -33,9 +33,6 @@ import java.io.Serializable; */ public interface ObjectIdentity extends Serializable { - // ~ Methods - // ======================================================================================================== - /** * @param obj to be compared * @return true if the objects are equal, false otherwise diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java index da817471b1..f39c58fe2e 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java @@ -25,9 +25,6 @@ package org.springframework.security.acls.model; */ public interface ObjectIdentityRetrievalStrategy { - // ~ Methods - // ======================================================================================================== - ObjectIdentity getObjectIdentity(Object domainObject); } diff --git a/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java b/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java index 856bd2f3b4..1d6932a110 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java @@ -26,9 +26,6 @@ package org.springframework.security.acls.model; */ public interface OwnershipAcl extends MutableAcl { - // ~ Methods - // ======================================================================================================== - void setOwner(Sid newOwner); } diff --git a/acl/src/main/java/org/springframework/security/acls/model/Permission.java b/acl/src/main/java/org/springframework/security/acls/model/Permission.java index ea44686f29..5e75764942 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/Permission.java +++ b/acl/src/main/java/org/springframework/security/acls/model/Permission.java @@ -24,18 +24,12 @@ import java.io.Serializable; */ public interface Permission extends Serializable { - // ~ Static fields/initializers - // ===================================================================================== - char RESERVED_ON = '~'; char RESERVED_OFF = '.'; String THIRTY_TWO_RESERVED_OFF = "................................"; - // ~ Methods - // ======================================================================================================== - /** * Returns the bits that represents the permission. * @return the bits that represent the permission diff --git a/acl/src/main/java/org/springframework/security/acls/model/Sid.java b/acl/src/main/java/org/springframework/security/acls/model/Sid.java index 4ced8b26f7..6f3e0e3aab 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/Sid.java +++ b/acl/src/main/java/org/springframework/security/acls/model/Sid.java @@ -32,9 +32,6 @@ import java.io.Serializable; */ public interface Sid extends Serializable { - // ~ Methods - // ======================================================================================================== - /** * Refer to the java.lang.Object documentation for the interface * contract. diff --git a/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java index 24397ea1cc..42694840d3 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java @@ -28,9 +28,6 @@ import org.springframework.security.core.Authentication; */ public interface SidRetrievalStrategy { - // ~ Methods - // ======================================================================================================== - List getSids(Authentication authentication); } diff --git a/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java b/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java index f48b60e11b..68f68b6c42 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java @@ -24,9 +24,6 @@ package org.springframework.security.acls.model; */ public class UnloadedSidException extends AclDataAccessException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an NotFoundException with the specified message. * @param msg the detail message diff --git a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java index 87fcd2e0e9..474e6db55c 100644 --- a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java +++ b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java @@ -29,8 +29,6 @@ import org.springframework.security.acls.model.Permission; */ public class AclFormattingUtilsTests { - // ~ Methods - // ======================================================================================================== @Test public final void testDemergePatternsParametersConstraints() { try { diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java index 0def085888..50d861a6c0 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java @@ -32,9 +32,6 @@ import org.springframework.security.acls.model.Sid; */ public class AccessControlImplEntryTests { - // ~ Methods - // ======================================================================================================== - @Test public void testConstructorRequiredFields() { // Check Acl field is present diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index fddbe66610..56e177e5ed 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java @@ -62,9 +62,6 @@ public class AclImplTests { private DefaultPermissionFactory permissionFactory; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { SecurityContextHolder.getContext().setAuthentication(auth); @@ -540,9 +537,6 @@ public class AclImplTests { ace.hashCode(); } - // ~ Inner Classes - // ================================================================================================== - private static class MaskPermissionGrantingStrategy extends DefaultPermissionGrantingStrategy { MaskPermissionGrantingStrategy(AuditLogger auditLogger) { diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java index a20536c691..ad4c88035c 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java @@ -38,9 +38,6 @@ public class AclImplementationSecurityCheckTests { private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject"; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { SecurityContextHolder.clearContext(); diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java index 3cd3daba23..3d7a40d220 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java @@ -34,8 +34,6 @@ import org.springframework.security.acls.model.AuditableAccessControlEntry; */ public class AuditLoggerTests { - // ~ Instance fields - // ================================================================================================ private PrintStream console; private ByteArrayOutputStream bytes = new ByteArrayOutputStream(); @@ -44,9 +42,6 @@ public class AuditLoggerTests { private AuditableAccessControlEntry ace; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { logger = new ConsoleAuditLogger(); diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java index a66c933441..3d894eb24d 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java @@ -32,9 +32,6 @@ public class ObjectIdentityImplTests { private static final String DOMAIN_CLASS = "org.springframework.security.acls.domain.ObjectIdentityImplTests$MockIdDomainObject"; - // ~ Methods - // ======================================================================================================== - @Test public void constructorsRespectRequiredFields() { // Check one-argument constructor required field @@ -177,9 +174,6 @@ public class ObjectIdentityImplTests { assertThat(obj).isNotEqualTo(obj2); } - // ~ Inner Classes - // ================================================================================================== - private class MockIdDomainObject { private Object id; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java index 7164690017..4f3af00026 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java @@ -28,8 +28,6 @@ import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy; */ public class ObjectIdentityRetrievalStrategyImplTests { - // ~ Methods - // ======================================================================================================== @Test public void testObjectIdentityCreation() { MockIdDomainObject domain = new MockIdDomainObject(); @@ -42,8 +40,6 @@ public class ObjectIdentityRetrievalStrategyImplTests { assertThat(new ObjectIdentityImpl(domain)).isEqualTo(identity); } - // ~ Inner Classes - // ================================================================================================== @SuppressWarnings("unused") private class MockIdDomainObject { diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java index 7c95c5dfbf..5ed871af84 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java @@ -56,16 +56,10 @@ public abstract class AbstractBasicLookupStrategyTests { protected static final Long OBJECT_IDENTITY_LONG_AS_UUID = 110L; - // ~ Instance fields - // ================================================================================================ - private BasicLookupStrategy strategy; private static CacheManager cacheManager; - // ~ Methods - // ======================================================================================================== - public abstract JdbcTemplate getJdbcTemplate(); public abstract DataSource getDataSource(); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java b/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java index 4533e58966..37ae9eb3d9 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java @@ -33,9 +33,6 @@ import javax.sql.DataSource; */ public class DatabaseSeeder { - // ~ Constructors - // =================================================================================================== - public DatabaseSeeder(DataSource dataSource, Resource resource) throws IOException { Assert.notNull(dataSource, "dataSource required"); Assert.notNull(resource, "resource required"); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java index 2ce64f73c2..1445c35aa4 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java @@ -112,9 +112,6 @@ public class JdbcAclServiceTests { assertThat(objectIdentities).isNull(); } - // ~ Some integration tests - // ======================================================================================================== - @Test public void findChildrenWithoutIdType() { ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 4711L); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java index 0d80c92051..af6adccc34 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java @@ -64,18 +64,12 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration(locations = { "/jdbcMutableAclServiceTests-context.xml" }) public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4SpringContextTests { - // ~ Constant fields - // ================================================================================================ - private static final String TARGET_CLASS = TargetObject.class.getName(); private final Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_ADMINISTRATOR"); public static final String SELECT_ALL_CLASSES = "SELECT * FROM acl_class WHERE class = ?"; - // ~ Instance fields - // ================================================================================================ - private final ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100L); private final ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, 101L); @@ -97,9 +91,6 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Autowired private JdbcTemplate jdbcTemplate; - // ~ Methods - // ======================================================================================================== - protected String getSqlClassPathResource() { return "createAclSchema.sql"; } diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java index 8972dfa378..9f96fa4ebd 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java @@ -42,9 +42,6 @@ public class SidRetrievalStrategyTests { Authentication authentication = new TestingAuthenticationToken("scott", "password", "A", "B", "C"); - // ~ Methods - // ======================================================================================================== - @Test public void correctSidsAreRetrieved() { SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl(); diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java index fe11171182..35e820af04 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java @@ -34,8 +34,6 @@ import java.util.Collections; public class SidTests { - // ~ Methods - // ======================================================================================================== @Test public void testPrincipalSidConstructorsRequiredFields() { // Check one String-argument constructor diff --git a/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java b/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java index 85bab3cc0e..7a3d40bcfb 100644 --- a/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java +++ b/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java @@ -34,9 +34,6 @@ public class ServiceProperties implements InitializingBean { public static final String DEFAULT_CAS_SERVICE_PARAMETER = "service"; - // ~ Instance fields - // ================================================================================================ - private String service; private boolean authenticateAllArtifacts; @@ -47,9 +44,6 @@ public class ServiceProperties implements InitializingBean { private String serviceParameter = DEFAULT_CAS_SERVICE_PARAMETER; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.hasLength(this.service, "service cannot be empty."); Assert.hasLength(this.artifactParameter, "artifactParameter cannot be empty."); diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java index e40696fb94..6699b04237 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java @@ -56,14 +56,8 @@ import org.springframework.util.Assert; */ public class CasAuthenticationProvider implements AuthenticationProvider, InitializingBean, MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(CasAuthenticationProvider.class); - // ~ Instance fields - // ================================================================================================ - private AuthenticationUserDetailsService authenticationUserDetailsService; private final UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker(); @@ -80,9 +74,6 @@ public class CasAuthenticationProvider implements AuthenticationProvider, Initia private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper(); - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(this.authenticationUserDetailsService, "An authenticationUserDetailsService must be set"); Assert.notNull(this.ticketValidator, "A ticketValidator must be set"); diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java index 3483b640cc..d938cd37cd 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java @@ -36,8 +36,6 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ private final Object credentials; private final Object principal; @@ -48,9 +46,6 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen private final Assertion assertion; - // ~ Constructors - // =================================================================================================== - /** * Constructor. * @param key to identify if this object made by a given @@ -110,9 +105,6 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen setAuthenticated(true); } - // ~ Methods - // ======================================================================================================== - private static Integer extractKeyHash(String key) { Assert.hasLength(key, "key cannot be null or empty"); return key.hashCode(); diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java index 7840387422..fd332f47b0 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java @@ -32,19 +32,10 @@ import org.springframework.util.Assert; */ public class EhCacheBasedTicketCache implements StatelessTicketCache, InitializingBean { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(EhCacheBasedTicketCache.class); - // ~ Instance fields - // ================================================================================================ - private Ehcache cache; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(cache, "cache mandatory"); } diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java index 01549d55bd..5a054531d9 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java @@ -29,27 +29,15 @@ import org.springframework.util.Assert; */ public class SpringCacheBasedTicketCache implements StatelessTicketCache { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(SpringCacheBasedTicketCache.class); - // ~ Instance fields - // ================================================================================================ - private final Cache cache; - // ~ Constructors - // =================================================================================================== - public SpringCacheBasedTicketCache(Cache cache) { Assert.notNull(cache, "cache mandatory"); this.cache = cache; } - // ~ Methods - // ======================================================================================================== - public CasAuthenticationToken getByTicketId(final String serviceTicket) { final Cache.ValueWrapper element = serviceTicket != null ? cache.get(serviceTicket) : null; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java index b17fd05ae0..74df6bb9df 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java @@ -60,8 +60,6 @@ package org.springframework.security.cas.authentication; */ public interface StatelessTicketCache { - // ~ Methods ================================================================ - /** * Retrieves the CasAuthenticationToken associated with the specified * ticket. diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java index 4e8d8a63f3..cfaec77bc3 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java @@ -44,8 +44,6 @@ import org.springframework.util.Assert; */ public class CasAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean { - // ~ Instance fields - // ================================================================================================ private ServiceProperties serviceProperties; private String loginUrl; @@ -61,9 +59,6 @@ public class CasAuthenticationEntryPoint implements AuthenticationEntryPoint, In */ private boolean encodeServiceUrlWithSessionId = true; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.hasLength(this.loginUrl, "loginUrl must be specified"); Assert.notNull(this.serviceProperties, "serviceProperties must be specified"); diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java index e88e85b0cb..674cd47f49 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java @@ -173,9 +173,6 @@ import org.springframework.util.Assert; */ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFilter { - // ~ Static fields/initializers - // ===================================================================================== - /** * Used to identify a CAS request for a stateful user agent, such as a web browser. */ @@ -205,17 +202,11 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil private AuthenticationFailureHandler proxyFailureHandler = new SimpleUrlAuthenticationFailureHandler(); - // ~ Constructors - // =================================================================================================== - public CasAuthenticationFilter() { super("/login/cas"); setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler()); } - // ~ Methods - // ======================================================================================================== - @Override protected final void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication authResult) throws IOException, ServletException { diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java index 271359abc1..6fc344e4f1 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java @@ -37,14 +37,8 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails private static final long serialVersionUID = 6192409090610517700L; - // ~ Instance fields - // ================================================================================================ - private final String serviceUrl; - // ~ Constructors - // =================================================================================================== - /** * Creates a new instance * @param request the current {@link HttpServletRequest} to obtain the @@ -63,9 +57,6 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails request.getRequestURI(), query); } - // ~ Methods - // ======================================================================================================== - /** * Returns the current URL minus the artifact parameter and its value, if present. * @see org.springframework.security.cas.web.authentication.ServiceAuthenticationDetails#getServiceUrl() diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java index 1e3c0ecbcc..1ab7fd4cc3 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java @@ -37,16 +37,10 @@ import org.springframework.util.Assert; public class ServiceAuthenticationDetailsSource implements AuthenticationDetailsSource { - // ~ Instance fields - // ================================================================================================ - private final Pattern artifactPattern; private ServiceProperties serviceProperties; - // ~ Constructors - // =================================================================================================== - /** * Creates an implementation that uses the specified ServiceProperties and the default * CAS artifactParameterName. @@ -69,9 +63,6 @@ public class ServiceAuthenticationDetailsSource this.artifactPattern = DefaultServiceAuthenticationDetails.createArtifactPattern(artifactParameterName); } - // ~ Methods - // ======================================================================================================== - /** * @param context the {@code HttpServletRequest} object. * @return the {@code ServiceAuthenticationDetails} containing information about the diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index dca51ceddf..c993ba8518 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -50,9 +50,6 @@ import java.util.*; @SuppressWarnings("unchecked") public class CasAuthenticationProviderTests { - // ~ Methods - // ======================================================================================================== - private UserDetails makeUserDetails() { return new User("user", "password", true, true, true, true, AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO")); @@ -372,9 +369,6 @@ public class CasAuthenticationProviderTests { assertThat(cap.supports(CasAuthenticationToken.class)).isTrue(); } - // ~ Inner Classes - // ================================================================================================== - private class MockAuthoritiesPopulator implements AuthenticationUserDetailsService { public UserDetails loadUserDetails(final Authentication token) throws UsernameNotFoundException { diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java index 05885f146c..e112ae68dc 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java @@ -37,8 +37,6 @@ public class EhCacheBasedTicketCacheTests extends AbstractStatelessTicketCacheTe private static CacheManager cacheManager; - // ~ Methods - // ======================================================================================================== @BeforeClass public static void initCacheManaer() { cacheManager = CacheManager.create(); diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java index 51b703617d..ea15e5ac18 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java @@ -34,9 +34,6 @@ public class SpringCacheBasedTicketCacheTests extends AbstractStatelessTicketCac private static CacheManager cacheManager; - // ~ Methods - // ======================================================================================================== - @BeforeClass public static void initCacheManaer() { cacheManager = new ConcurrentMapCacheManager(); diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java index 05da9f1fef..f37f78676d 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java @@ -33,8 +33,6 @@ import org.springframework.security.cas.ServiceProperties; */ public class CasAuthenticationEntryPointTests { - // ~ Methods - // ======================================================================================================== @Test public void testDetectsMissingLoginFormUrl() throws Exception { CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint(); diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java index 848ba5d36b..4fe07a07c6 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java @@ -45,9 +45,6 @@ import static org.mockito.Mockito.*; */ public class CasAuthenticationFilterTests { - // ~ Methods - // ======================================================================================================== - @After public void tearDown() { SecurityContextHolder.clearContext(); diff --git a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java index e19ea137b6..c3981604c6 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java @@ -29,9 +29,6 @@ import org.springframework.security.cas.ServiceProperties; */ public class ServicePropertiesTests { - // ~ Methods - // ======================================================================================================== - @Test(expected = IllegalArgumentException.class) public void detectsMissingService() throws Exception { ServiceProperties sp = new ServiceProperties(); diff --git a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java index 09142c1fd6..911f8f0738 100644 --- a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java +++ b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java @@ -28,9 +28,6 @@ import org.springframework.util.Assert; */ public class DataSourcePopulator implements InitializingBean { - // ~ Instance fields - // ================================================================================================ - JdbcTemplate template; public void afterPropertiesSet() { diff --git a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java index 88da0c4605..a1ce51cd78 100644 --- a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java @@ -53,9 +53,6 @@ public class FilterChainProxyConfigTests { private ClassPathXmlApplicationContext appCtx; - // ~ Methods - // ======================================================================================================== - @Before public void loadContext() { System.setProperty("sec1235.pattern1", "/login"); diff --git a/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java index 6fff3153cc..eabb82e25d 100644 --- a/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java @@ -28,9 +28,6 @@ import org.springframework.security.core.Authentication; */ public interface AccessDecisionManager { - // ~ Methods - // ======================================================================================================== - /** * Resolves an access control decision for the passed parameters. * @param authentication the caller invoking the method (not null) diff --git a/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java b/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java index 1abb45b2ce..e1d98fc8f3 100644 --- a/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java +++ b/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java @@ -31,18 +31,12 @@ import org.springframework.security.core.Authentication; */ public interface AccessDecisionVoter { - // ~ Static fields/initializers - // ===================================================================================== - int ACCESS_GRANTED = 1; int ACCESS_ABSTAIN = 0; int ACCESS_DENIED = -1; - // ~ Methods - // ======================================================================================================== - /** * Indicates whether this {@code AccessDecisionVoter} is able to vote on the passed * {@code ConfigAttribute}. diff --git a/core/src/main/java/org/springframework/security/access/AccessDeniedException.java b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java index 1fe26e846f..4d703b30c7 100644 --- a/core/src/main/java/org/springframework/security/access/AccessDeniedException.java +++ b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java @@ -24,9 +24,6 @@ package org.springframework.security.access; */ public class AccessDeniedException extends RuntimeException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an AccessDeniedException with the specified message. * @param msg the detail message diff --git a/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java b/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java index febbc6b8ba..92691877f0 100644 --- a/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java @@ -29,9 +29,6 @@ import org.springframework.security.core.Authentication; */ public interface AfterInvocationProvider { - // ~ Methods - // ======================================================================================================== - Object decide(Authentication authentication, Object object, Collection attributes, Object returnedObject) throws AccessDeniedException; diff --git a/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java b/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java index 87fc2dc7a5..7fe3affa79 100644 --- a/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java +++ b/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java @@ -26,9 +26,6 @@ package org.springframework.security.access; */ public class AuthorizationServiceException extends AccessDeniedException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an AuthorizationServiceException with the specified * message. diff --git a/core/src/main/java/org/springframework/security/access/ConfigAttribute.java b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java index d85cd30abb..b1708a6e3c 100644 --- a/core/src/main/java/org/springframework/security/access/ConfigAttribute.java +++ b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java @@ -38,9 +38,6 @@ import org.springframework.security.access.intercept.RunAsManager; */ public interface ConfigAttribute extends Serializable { - // ~ Methods - // ======================================================================================================== - /** * If the ConfigAttribute can be represented as a String and * that String is sufficient in precision to be relied upon as a diff --git a/core/src/main/java/org/springframework/security/access/SecurityConfig.java b/core/src/main/java/org/springframework/security/access/SecurityConfig.java index 6b5545e77d..c6888dff8a 100644 --- a/core/src/main/java/org/springframework/security/access/SecurityConfig.java +++ b/core/src/main/java/org/springframework/security/access/SecurityConfig.java @@ -29,22 +29,13 @@ import org.springframework.util.StringUtils; */ public class SecurityConfig implements ConfigAttribute { - // ~ Instance fields - // ================================================================================================ - private final String attrib; - // ~ Constructors - // =================================================================================================== - public SecurityConfig(String config) { Assert.hasText(config, "You must provide a configuration attribute"); this.attrib = config; } - // ~ Methods - // ======================================================================================================== - @Override public boolean equals(Object obj) { if (obj instanceof ConfigAttribute) { diff --git a/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java index 27a9b1d3ed..6e504db9b6 100644 --- a/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java @@ -29,9 +29,6 @@ import org.springframework.security.access.intercept.AbstractSecurityInterceptor */ public interface SecurityMetadataSource extends AopInfrastructureBean { - // ~ Methods - // ======================================================================================================== - /** * Accesses the {@code ConfigAttribute}s that apply to a given secure object. * @param object the object being secured diff --git a/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java b/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java index 6bde97aa2a..a285007615 100644 --- a/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java @@ -25,9 +25,6 @@ import org.springframework.context.ApplicationEvent; */ public abstract class AbstractAuthorizationEvent extends ApplicationEvent { - // ~ Constructors - // =================================================================================================== - /** * Construct the event, passing in the secure object being intercepted. * @param secureObject the secure object diff --git a/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java index c60b2095cb..fedad57952 100644 --- a/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java @@ -29,16 +29,10 @@ import org.springframework.security.authentication.AuthenticationCredentialsNotF */ public class AuthenticationCredentialsNotFoundEvent extends AbstractAuthorizationEvent { - // ~ Instance fields - // ================================================================================================ - private AuthenticationCredentialsNotFoundException credentialsNotFoundException; private Collection configAttribs; - // ~ Constructors - // =================================================================================================== - /** * Construct the event. * @param secureObject the secure object @@ -59,9 +53,6 @@ public class AuthenticationCredentialsNotFoundEvent extends AbstractAuthorizatio this.credentialsNotFoundException = credentialsNotFoundException; } - // ~ Methods - // ======================================================================================================== - public Collection getConfigAttributes() { return configAttribs; } diff --git a/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java index 26374e65f6..f9672400c5 100644 --- a/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java @@ -36,18 +36,12 @@ import org.springframework.security.core.Authentication; */ public class AuthorizationFailureEvent extends AbstractAuthorizationEvent { - // ~ Instance fields - // ================================================================================================ - private AccessDeniedException accessDeniedException; private Authentication authentication; private Collection configAttributes; - // ~ Constructors - // =================================================================================================== - /** * Construct the event. * @param secureObject the secure object @@ -70,9 +64,6 @@ public class AuthorizationFailureEvent extends AbstractAuthorizationEvent { this.accessDeniedException = accessDeniedException; } - // ~ Methods - // ======================================================================================================== - public AccessDeniedException getAccessDeniedException() { return accessDeniedException; } diff --git a/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java index da8846c7d7..ea5873bd86 100644 --- a/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java @@ -31,16 +31,10 @@ import org.springframework.security.core.Authentication; */ public class AuthorizedEvent extends AbstractAuthorizationEvent { - // ~ Instance fields - // ================================================================================================ - private Authentication authentication; private Collection configAttributes; - // ~ Constructors - // =================================================================================================== - /** * Construct the event. * @param secureObject the secure object @@ -59,9 +53,6 @@ public class AuthorizedEvent extends AbstractAuthorizationEvent { this.authentication = authentication; } - // ~ Methods - // ======================================================================================================== - public Authentication getAuthentication() { return authentication; } diff --git a/core/src/main/java/org/springframework/security/access/event/LoggerListener.java b/core/src/main/java/org/springframework/security/access/event/LoggerListener.java index ce0d7c3f04..9016c49029 100644 --- a/core/src/main/java/org/springframework/security/access/event/LoggerListener.java +++ b/core/src/main/java/org/springframework/security/access/event/LoggerListener.java @@ -31,14 +31,8 @@ import org.springframework.context.ApplicationListener; */ public class LoggerListener implements ApplicationListener { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(LoggerListener.class); - // ~ Methods - // ======================================================================================================== - public void onApplicationEvent(AbstractAuthorizationEvent event) { if (event instanceof AuthenticationCredentialsNotFoundEvent) { AuthenticationCredentialsNotFoundEvent authEvent = (AuthenticationCredentialsNotFoundEvent) event; diff --git a/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java b/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java index f82d3713ea..2ce5db3a85 100644 --- a/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java @@ -31,9 +31,6 @@ package org.springframework.security.access.event; */ public class PublicInvocationEvent extends AbstractAuthorizationEvent { - // ~ Constructors - // =================================================================================================== - /** * Construct the event, passing in the public secure object. * @param secureObject the public secure object diff --git a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java index 40a34d6260..302ee8276c 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java @@ -104,14 +104,8 @@ import org.springframework.util.Assert; public abstract class AbstractSecurityInterceptor implements InitializingBean, ApplicationEventPublisherAware, MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - protected final Log logger = LogFactory.getLog(getClass()); - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private ApplicationEventPublisher eventPublisher; @@ -132,9 +126,6 @@ public abstract class AbstractSecurityInterceptor private boolean publishAuthorizationSuccess = false; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(getSecureObjectClass(), "Subclass must provide a non-null response to getSecureObjectClass()"); Assert.notNull(this.messages, "A message source must be set"); diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java index 7c11320a00..679b495d54 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java @@ -44,9 +44,6 @@ import org.springframework.security.core.Authentication; */ public interface AfterInvocationManager { - // ~ Methods - // ======================================================================================================== - /** * Given the details of a secure object invocation including its returned * Object, make an access control decision or optionally modify the diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java index c223186b9d..e8ddfdb39b 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java @@ -47,19 +47,10 @@ import org.springframework.util.Assert; */ public class AfterInvocationProviderManager implements AfterInvocationManager, InitializingBean { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(AfterInvocationProviderManager.class); - // ~ Instance fields - // ================================================================================================ - private List providers; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { checkIfValidList(this.providers); } diff --git a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java index 74ea128212..0199ed258e 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java +++ b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java @@ -32,9 +32,6 @@ import org.springframework.security.core.context.SecurityContext; */ public class InterceptorStatusToken { - // ~ Instance fields - // ================================================================================================ - private SecurityContext securityContext; private Collection attr; @@ -43,9 +40,6 @@ public class InterceptorStatusToken { private boolean contextHolderRefreshRequired; - // ~ Constructors - // =================================================================================================== - public InterceptorStatusToken(SecurityContext securityContext, boolean contextHolderRefreshRequired, Collection attributes, Object secureObject) { this.securityContext = securityContext; @@ -54,9 +48,6 @@ public class InterceptorStatusToken { this.secureObject = secureObject; } - // ~ Methods - // ======================================================================================================== - public Collection getAttributes() { return attr; } diff --git a/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java b/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java index 2438fe293c..d3988e0b5b 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java @@ -44,19 +44,10 @@ import org.springframework.util.Assert; */ public class MethodInvocationPrivilegeEvaluator implements InitializingBean { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(MethodInvocationPrivilegeEvaluator.class); - // ~ Instance fields - // ================================================================================================ - private AbstractSecurityInterceptor securityInterceptor; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(securityInterceptor, "SecurityInterceptor required"); } diff --git a/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java index 77fb80cd3a..71c752f018 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java @@ -31,9 +31,6 @@ import org.springframework.security.core.Authentication; */ final class NullRunAsManager implements RunAsManager { - // ~ Methods - // ======================================================================================================== - public Authentication buildRunAs(Authentication authentication, Object object, Collection config) { return null; } diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java index 805ae2d814..26056a82d2 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java @@ -45,16 +45,10 @@ import org.springframework.util.Assert; */ public class RunAsImplAuthenticationProvider implements InitializingBean, AuthenticationProvider, MessageSourceAware { - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private String key; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(key, "A Key is required and should match that configured for the RunAsManagerImpl"); } diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java index a244177a21..e121b9bb5b 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java @@ -60,9 +60,6 @@ import org.springframework.security.core.Authentication; */ public interface RunAsManager { - // ~ Methods - // ======================================================================================================== - /** * Returns a replacement Authentication object for the current secure * object invocation, or null if replacement not required. diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java index 8f2794dea5..ddb28f4b1f 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java @@ -55,16 +55,10 @@ import org.springframework.util.Assert; */ public class RunAsManagerImpl implements RunAsManager, InitializingBean { - // ~ Instance fields - // ================================================================================================ - private String key; private String rolePrefix = "ROLE_"; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(key, "A Key is required and should match that configured for the RunAsImplAuthenticationProvider"); diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java index fe608b511c..ecd683b892 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java @@ -33,9 +33,6 @@ public class RunAsUserToken extends AbstractAuthenticationToken { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private final Class originalAuthentication; private final Object credentials; @@ -44,9 +41,6 @@ public class RunAsUserToken extends AbstractAuthenticationToken { private final int keyHash; - // ~ Constructors - // =================================================================================================== - public RunAsUserToken(String key, Object principal, Object credentials, Collection authorities, Class originalAuthentication) { @@ -58,9 +52,6 @@ public class RunAsUserToken extends AbstractAuthenticationToken { setAuthenticated(true); } - // ~ Methods - // ======================================================================================================== - @Override public Object getCredentials() { return this.credentials; diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java index f69054698c..c42435896d 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java @@ -39,14 +39,8 @@ import org.aopalliance.intercept.MethodInvocation; */ public class MethodSecurityInterceptor extends AbstractSecurityInterceptor implements MethodInterceptor { - // ~ Instance fields - // ================================================================================================ - private MethodSecurityMetadataSource securityMetadataSource; - // ~ Methods - // ======================================================================================================== - public Class getSecureObjectClass() { return MethodInvocation.class; } diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java index bec9cb0bf8..739c6e2c2c 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java @@ -53,9 +53,6 @@ import org.springframework.util.Assert; */ public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware { - // ~ Instance fields - // ================================================================================================ - private transient MethodSecurityMetadataSource attributeSource; private transient MethodInterceptor interceptor; @@ -70,9 +67,6 @@ public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor private transient volatile Object adviceMonitor = new Object(); - // ~ Constructors - // =================================================================================================== - /** * Alternative constructor for situations where we want the advisor decoupled from the * advice. Instead the advice bean name should be set. This prevents eager @@ -96,9 +90,6 @@ public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor this.metadataSourceBeanName = attributeSourceBeanName; } - // ~ Methods - // ======================================================================================================== - public Pointcut getPointcut() { return pointcut; } @@ -124,9 +115,6 @@ public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor attributeSource = beanFactory.getBean(metadataSourceBeanName, MethodSecurityMetadataSource.class); } - // ~ Inner Classes - // ================================================================================================== - class MethodSecurityMetadataSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { @SuppressWarnings("unchecked") diff --git a/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java b/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java index d960d62372..f82855ac33 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java +++ b/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java @@ -25,9 +25,6 @@ package org.springframework.security.access.intercept.aspectj; */ public interface AspectJCallback { - // ~ Methods - // ======================================================================================================== - Object proceedWithObject(); } diff --git a/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java index 88dc80fb05..f31d87dea5 100644 --- a/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java @@ -35,9 +35,6 @@ public abstract class AbstractMethodSecurityMetadataSource implements MethodSecu protected final Log logger = LogFactory.getLog(getClass()); - // ~ Methods - // ======================================================================================================== - public final Collection getAttributes(Object object) { if (object instanceof MethodInvocation) { MethodInvocation mi = (MethodInvocation) object; diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java index e51853c6cb..a0173dd043 100644 --- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java @@ -44,17 +44,11 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod private final Map> attributeCache = new HashMap<>(); - // ~ Constructor - // ==================================================================================================== - public DelegatingMethodSecurityMetadataSource(List methodSecurityMetadataSources) { Assert.notNull(methodSecurityMetadataSources, "MethodSecurityMetadataSources cannot be null"); this.methodSecurityMetadataSources = methodSecurityMetadataSources; } - // ~ Methods - // ======================================================================================================== - public Collection getAttributes(Method method, Class targetClass) { DefaultCacheKey cacheKey = new DefaultCacheKey(method, targetClass); synchronized (attributeCache) { @@ -106,9 +100,6 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod return methodSecurityMetadataSources; } - // ~ Inner Classes - // ================================================================================================== - private static class DefaultCacheKey { private final Method method; diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index 2591c1655c..a501544ed6 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -45,8 +45,6 @@ import org.springframework.util.ClassUtils; public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource implements BeanClassLoaderAware { - // ~ Instance fields - // ================================================================================================ private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); /** Map from RegisteredMethod to ConfigAttribute list */ @@ -55,9 +53,6 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod /** Map from RegisteredMethod to name pattern used for registration */ private final Map nameMap = new HashMap<>(); - // ~ Methods - // ======================================================================================================== - public MapBasedMethodSecurityMetadataSource() { } diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java index cffdef99da..aeb22831a0 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java @@ -42,8 +42,6 @@ import org.springframework.util.Assert; public abstract class AbstractAccessDecisionManager implements AccessDecisionManager, InitializingBean, MessageSourceAware { - // ~ Instance fields - // ================================================================================================ protected final Log logger = LogFactory.getLog(getClass()); private List> decisionVoters; @@ -57,9 +55,6 @@ public abstract class AbstractAccessDecisionManager this.decisionVoters = decisionVoters; } - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notEmpty(this.decisionVoters, "A list of AccessDecisionVoters is required"); Assert.notNull(this.messages, "A message source must be set"); diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java index 7b2eb5e24a..ae26fd02b1 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java @@ -28,14 +28,8 @@ import org.springframework.util.Assert; */ public abstract class AbstractAclVoter implements AccessDecisionVoter { - // ~ Instance fields - // ================================================================================================ - private Class processDomainObjectClass; - // ~ Methods - // ======================================================================================================== - protected Object getDomainObjectInstance(MethodInvocation invocation) { Object[] args; Class[] params; diff --git a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java index c43aad9c14..3f0d3e4502 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java @@ -34,9 +34,6 @@ public class AffirmativeBased extends AbstractAccessDecisionManager { super(decisionVoters); } - // ~ Methods - // ======================================================================================================== - /** * This concrete implementation simply polls all configured * {@link AccessDecisionVoter}s and grants access if any diff --git a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java index 36addaffdc..7307254fb7 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java @@ -48,23 +48,14 @@ import org.springframework.util.Assert; */ public class AuthenticatedVoter implements AccessDecisionVoter { - // ~ Static fields/initializers - // ===================================================================================== - public static final String IS_AUTHENTICATED_FULLY = "IS_AUTHENTICATED_FULLY"; public static final String IS_AUTHENTICATED_REMEMBERED = "IS_AUTHENTICATED_REMEMBERED"; public static final String IS_AUTHENTICATED_ANONYMOUSLY = "IS_AUTHENTICATED_ANONYMOUSLY"; - // ~ Instance fields - // ================================================================================================ - private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl(); - // ~ Methods - // ======================================================================================================== - private boolean isFullyAuthenticated(Authentication authentication) { return (!authenticationTrustResolver.isAnonymous(authentication) && !authenticationTrustResolver.isRememberMe(authentication)); diff --git a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java index d113655c7e..c66d639e30 100644 --- a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java @@ -34,18 +34,12 @@ import org.springframework.security.core.Authentication; */ public class ConsensusBased extends AbstractAccessDecisionManager { - // ~ Instance fields - // ================================================================================================ - private boolean allowIfEqualGrantedDeniedDecisions = true; public ConsensusBased(List> decisionVoters) { super(decisionVoters); } - // ~ Methods - // ======================================================================================================== - /** * This concrete implementation simply polls all configured * {@link AccessDecisionVoter}s and upon completion determines the consensus of diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java index e61ba03b3c..4f2d4a6ae0 100644 --- a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java @@ -51,14 +51,8 @@ import org.springframework.security.core.GrantedAuthority; */ public class RoleVoter implements AccessDecisionVoter { - // ~ Instance fields - // ================================================================================================ - private String rolePrefix = "ROLE_"; - // ~ Methods - // ======================================================================================================== - public String getRolePrefix() { return rolePrefix; } diff --git a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java index 7408cf5eab..ad6c9a6e6a 100644 --- a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java @@ -36,9 +36,6 @@ public class UnanimousBased extends AbstractAccessDecisionManager { super(decisionVoters); } - // ~ Methods - // ======================================================================================================== - /** * This concrete implementation polls all configured {@link AccessDecisionVoter}s for * each {@link ConfigAttribute} and grants access if only grant (or abstain) diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java index 9032826953..9f87117cce 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java @@ -38,18 +38,12 @@ import org.springframework.security.core.userdetails.UserDetails; */ public abstract class AbstractAuthenticationToken implements Authentication, CredentialsContainer { - // ~ Instance fields - // ================================================================================================ - private final Collection authorities; private Object details; private boolean authenticated = false; - // ~ Constructors - // =================================================================================================== - /** * Creates a token with the supplied array of authorities. * @param authorities the collection of GrantedAuthoritys for the principal @@ -71,9 +65,6 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre this.authorities = Collections.unmodifiableList(temp); } - // ~ Methods - // ======================================================================================================== - public Collection getAuthorities() { return authorities; } diff --git a/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java b/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java index a147bed9a4..b5a3c17062 100644 --- a/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java +++ b/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java @@ -24,9 +24,6 @@ package org.springframework.security.authentication; */ public class AccountExpiredException extends AccountStatusException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a AccountExpiredException with the specified message. * @param msg the detail message diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java index a74b615f53..6643dc6695 100644 --- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java @@ -35,9 +35,6 @@ import org.springframework.util.Assert; */ public class AnonymousAuthenticationProvider implements AuthenticationProvider, MessageSourceAware { - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private String key; @@ -47,9 +44,6 @@ public class AnonymousAuthenticationProvider implements AuthenticationProvider, this.key = key; } - // ~ Methods - // ======================================================================================================== - public Authentication authenticate(Authentication authentication) throws AuthenticationException { if (!supports(authentication.getClass())) { return null; diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java index 6de6ed2cae..ede6e269b2 100644 --- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java @@ -29,18 +29,12 @@ import org.springframework.util.Assert; */ public class AnonymousAuthenticationToken extends AbstractAuthenticationToken implements Serializable { - // ~ Instance fields - // ================================================================================================ - private static final long serialVersionUID = 1L; private final Object principal; private final int keyHash; - // ~ Constructors - // =================================================================================================== - /** * Constructor. * @param key to identify if this object made by an authorised client @@ -74,9 +68,6 @@ public class AnonymousAuthenticationToken extends AbstractAuthenticationToken im setAuthenticated(true); } - // ~ Methods - // ======================================================================================================== - private static Integer extractKeyHash(String key) { Assert.hasLength(key, "key cannot be empty or null"); return key.hashCode(); diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java index 4341f13393..7224110fb0 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java @@ -28,9 +28,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationCredentialsNotFoundException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an AuthenticationCredentialsNotFoundException with the * specified message. diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java index 8c6af9199b..780aed8eca 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java @@ -24,9 +24,6 @@ package org.springframework.security.authentication; */ public interface AuthenticationDetailsSource { - // ~ Methods - // ======================================================================================================== - /** * Called by a class when it wishes a new authentication details instance to be * created. diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java index 6a8d48ecff..b98c835149 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java @@ -26,9 +26,6 @@ import org.springframework.security.core.AuthenticationException; */ public interface AuthenticationManager { - // ~ Methods - // ======================================================================================================== - /** * Attempts to authenticate the passed {@link Authentication} object, returning a * fully populated Authentication object (including granted authorities) diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java index 9167027a06..86e4c6e27e 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public interface AuthenticationProvider { - // ~ Methods - // ======================================================================================================== - /** * Performs authentication with the same contract as * {@link org.springframework.security.authentication.AuthenticationManager#authenticate(Authentication)} diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java index bc1736b489..b87f01d647 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java @@ -29,9 +29,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationServiceException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an AuthenticationServiceException with the specified * message. diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java index c218dcfca6..b0de70d2ce 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java @@ -25,9 +25,6 @@ import org.springframework.security.core.Authentication; */ public interface AuthenticationTrustResolver { - // ~ Methods - // ======================================================================================================== - /** * Indicates whether the passed Authentication token represents an * anonymous user. Typically the framework will call this method if it is trying to diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java index b9292965fc..ae20478bb3 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java @@ -31,16 +31,10 @@ import org.springframework.security.core.Authentication; */ public class AuthenticationTrustResolverImpl implements AuthenticationTrustResolver { - // ~ Instance fields - // ================================================================================================ - private Class anonymousClass = AnonymousAuthenticationToken.class; private Class rememberMeClass = RememberMeAuthenticationToken.class; - // ~ Methods - // ======================================================================================================== - Class getAnonymousClass() { return anonymousClass; } diff --git a/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java b/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java index 15f9bce92e..6f8dc3d485 100644 --- a/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java +++ b/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java @@ -26,9 +26,6 @@ import org.springframework.security.core.AuthenticationException; */ public class BadCredentialsException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a BadCredentialsException with the specified message. * @param msg the detail message diff --git a/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java b/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java index eaa1fa1226..0387996518 100644 --- a/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java +++ b/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java @@ -24,9 +24,6 @@ package org.springframework.security.authentication; */ public class CredentialsExpiredException extends AccountStatusException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a CredentialsExpiredException with the specified message. * @param msg the detail message diff --git a/core/src/main/java/org/springframework/security/authentication/DisabledException.java b/core/src/main/java/org/springframework/security/authentication/DisabledException.java index 92d63cb4c9..bb87e72f6f 100644 --- a/core/src/main/java/org/springframework/security/authentication/DisabledException.java +++ b/core/src/main/java/org/springframework/security/authentication/DisabledException.java @@ -24,9 +24,6 @@ package org.springframework.security.authentication; */ public class DisabledException extends AccountStatusException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a DisabledException with the specified message. * @param msg the detail message diff --git a/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java b/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java index 6cc4c09f05..34f84ca351 100644 --- a/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java +++ b/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java @@ -33,9 +33,6 @@ import org.springframework.security.core.AuthenticationException; */ public class InsufficientAuthenticationException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an InsufficientAuthenticationException with the specified * message. diff --git a/core/src/main/java/org/springframework/security/authentication/LockedException.java b/core/src/main/java/org/springframework/security/authentication/LockedException.java index 7dd2464959..f0aa3b5231 100644 --- a/core/src/main/java/org/springframework/security/authentication/LockedException.java +++ b/core/src/main/java/org/springframework/security/authentication/LockedException.java @@ -24,9 +24,6 @@ package org.springframework.security.authentication; */ public class LockedException extends AccountStatusException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a LockedException with the specified message. * @param msg the detail message. diff --git a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java index 93af53655f..3e052d4bc3 100644 --- a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java +++ b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java @@ -86,14 +86,8 @@ import org.springframework.util.CollectionUtils; */ public class ProviderManager implements AuthenticationManager, MessageSourceAware, InitializingBean { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(ProviderManager.class); - // ~ Instance fields - // ================================================================================================ - private AuthenticationEventPublisher eventPublisher = new NullEventPublisher(); private List providers = Collections.emptyList(); @@ -132,9 +126,6 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar checkState(); } - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { checkState(); } diff --git a/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java b/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java index 4cde08daa9..629a28e8c8 100644 --- a/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java +++ b/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class ProviderNotFoundException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a ProviderNotFoundException with the specified message. * @param msg the detail message diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java index 0eb69c59fa..552232bddb 100644 --- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java @@ -34,9 +34,6 @@ import org.springframework.util.Assert; */ public class RememberMeAuthenticationProvider implements AuthenticationProvider, InitializingBean, MessageSourceAware { - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private String key; @@ -46,9 +43,6 @@ public class RememberMeAuthenticationProvider implements AuthenticationProvider, this.key = key; } - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(this.messages, "A message source must be set"); } diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java index 25a53c6783..cf26e8851b 100644 --- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java @@ -34,16 +34,10 @@ public class RememberMeAuthenticationToken extends AbstractAuthenticationToken { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private final Object principal; private final int keyHash; - // ~ Constructors - // =================================================================================================== - /** * Constructor. * @param key to identify if this object made by an authorised client @@ -80,9 +74,6 @@ public class RememberMeAuthenticationToken extends AbstractAuthenticationToken { setAuthenticated(true); } - // ~ Methods - // ======================================================================================================== - /** * Always returns an empty String * @return an empty String diff --git a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java index d71cb0be5e..d94be00f44 100644 --- a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java @@ -34,9 +34,6 @@ import org.springframework.security.core.AuthenticationException; */ public class TestingAuthenticationProvider implements AuthenticationProvider { - // ~ Methods - // ======================================================================================================== - public Authentication authenticate(Authentication authentication) throws AuthenticationException { return authentication; } diff --git a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java index 18ee4ec882..1fbdd5f464 100644 --- a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java @@ -31,18 +31,12 @@ import java.util.List; */ public class TestingAuthenticationToken extends AbstractAuthenticationToken { - // ~ Instance fields - // ================================================================================================ - private static final long serialVersionUID = 1L; private final Object credentials; private final Object principal; - // ~ Constructors - // =================================================================================================== - public TestingAuthenticationToken(Object principal, Object credentials) { super(null); this.principal = principal; @@ -60,9 +54,6 @@ public class TestingAuthenticationToken extends AbstractAuthenticationToken { setAuthenticated(true); } - // ~ Methods - // ======================================================================================================== - public Object getCredentials() { return this.credentials; } diff --git a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java index 634cc35f50..4dbb5778fe 100644 --- a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java @@ -36,16 +36,10 @@ public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationT private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private final Object principal; private Object credentials; - // ~ Constructors - // =================================================================================================== - /** * This constructor can be safely used by any code that wishes to create a * UsernamePasswordAuthenticationToken, as the {@link #isAuthenticated()} @@ -76,9 +70,6 @@ public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationT super.setAuthenticated(true); // must use super, as we override } - // ~ Methods - // ======================================================================================================== - public Object getCredentials() { return this.credentials; } diff --git a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java index cc054bc87e..72b2d78d8c 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java @@ -81,9 +81,6 @@ public abstract class AbstractUserDetailsAuthenticationProvider protected final Log logger = LogFactory.getLog(getClass()); - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private UserCache userCache = new NullUserCache(); @@ -98,9 +95,6 @@ public abstract class AbstractUserDetailsAuthenticationProvider private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper(); - // ~ Methods - // ======================================================================================================== - /** * Allows subclasses to perform any additional checks of a returned (or cached) * UserDetails for a given authentication request. Generally a subclass diff --git a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java index f2a2b57769..e9e22da87d 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java @@ -39,18 +39,12 @@ import org.springframework.util.Assert; */ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider { - // ~ Static fields/initializers - // ===================================================================================== - /** * The plaintext password used to perform PasswordEncoder#matches(CharSequence, * String)} on when the user is not found to avoid SEC-2056. */ private static final String USER_NOT_FOUND_PASSWORD = "userNotFoundPassword"; - // ~ Instance fields - // ================================================================================================ - private PasswordEncoder passwordEncoder; /** @@ -69,9 +63,6 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication setPasswordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder()); } - // ~ Methods - // ======================================================================================================== - @SuppressWarnings("deprecation") protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException { diff --git a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java index 4c6975d322..e257eab277 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java @@ -31,16 +31,10 @@ import org.springframework.context.ApplicationEvent; */ public abstract class AbstractAuthenticationEvent extends ApplicationEvent { - // ~ Constructors - // =================================================================================================== - public AbstractAuthenticationEvent(Authentication authentication) { super(authentication); } - // ~ Methods - // ======================================================================================================== - /** * Getters for the Authentication request that caused the event. Also * available from super.getSource(). diff --git a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java index 906ee2a3d9..d9928db38d 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java @@ -28,23 +28,14 @@ import org.springframework.util.Assert; */ public abstract class AbstractAuthenticationFailureEvent extends AbstractAuthenticationEvent { - // ~ Instance fields - // ================================================================================================ - private final AuthenticationException exception; - // ~ Constructors - // =================================================================================================== - public AbstractAuthenticationFailureEvent(Authentication authentication, AuthenticationException exception) { super(authentication); Assert.notNull(exception, "AuthenticationException is required"); this.exception = exception; } - // ~ Methods - // ======================================================================================================== - public AuthenticationException getException() { return exception; } diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java index 2d895f88c9..796690b0e6 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureBadCredentialsEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureBadCredentialsEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); } diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java index f9e3c20c52..57f218a239 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureCredentialsExpiredEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureCredentialsExpiredEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java index 12bd98bf2a..3a4604354f 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureDisabledEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureDisabledEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); } diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java index c0c00a8321..086e16cb37 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureExpiredEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureExpiredEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); } diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java index b4a63f5257..544964cdec 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureLockedEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureLockedEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); } diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java index 86e84c819c..1a1cf7c87e 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureProviderNotFoundEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureProviderNotFoundEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java index c64fdc3d85..772774d3f1 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureProxyUntrustedEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureProxyUntrustedEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); } diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java index 565d022d87..167d5fae3b 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java @@ -27,9 +27,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationFailureServiceExceptionEvent extends AbstractAuthenticationFailureEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationFailureServiceExceptionEvent(Authentication authentication, AuthenticationException exception) { super(authentication, exception); diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java index 6eafa52c9e..5b3b9bcd24 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java @@ -25,9 +25,6 @@ import org.springframework.security.core.Authentication; */ public class AuthenticationSuccessEvent extends AbstractAuthenticationEvent { - // ~ Constructors - // =================================================================================================== - public AuthenticationSuccessEvent(Authentication authentication) { super(authentication); } diff --git a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java index d73b49a4b7..a7c36a5b53 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java @@ -35,23 +35,14 @@ import org.springframework.util.Assert; */ public class InteractiveAuthenticationSuccessEvent extends AbstractAuthenticationEvent { - // ~ Instance fields - // ================================================================================================ - private final Class generatedBy; - // ~ Constructors - // =================================================================================================== - public InteractiveAuthenticationSuccessEvent(Authentication authentication, Class generatedBy) { super(authentication); Assert.notNull(generatedBy, "generatedBy cannot be null"); this.generatedBy = generatedBy; } - // ~ Methods - // ======================================================================================================== - /** * Getter for the Class that generated this event. This can be useful for * generating additional logging information. diff --git a/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java index 8332e48999..d322e2891e 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java +++ b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java @@ -30,9 +30,6 @@ import org.springframework.util.ClassUtils; */ public class LoggerListener implements ApplicationListener { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(LoggerListener.class); /** @@ -41,9 +38,6 @@ public class LoggerListener implements ApplicationListener { - // ~ Instance fields - // ================================================================================================ - private ApplicationEventPublisher applicationEventPublisher; private AuthorityGranter[] authorityGranters; @@ -131,9 +128,6 @@ public abstract class AbstractJaasAuthenticationProvider implements Authenticati private String loginContextName = "SPRINGSECURITY"; - // ~ Methods - // ======================================================================================================== - /** * Validates the required properties are set. In addition, if * {@link #setCallbackHandlers(JaasAuthenticationCallbackHandler[])} has not been @@ -370,9 +364,6 @@ public abstract class AbstractJaasAuthenticationProvider implements Authenticati return this.applicationEventPublisher; } - // ~ Inner Classes - // ================================================================================================== - /** * Wrapper class for JAASAuthenticationCallbackHandlers */ diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java b/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java index 14f0961d8e..db15f76e80 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java @@ -31,9 +31,6 @@ import java.util.Set; */ public interface AuthorityGranter { - // ~ Methods - // ======================================================================================================== - /** * The grant method is called for each principal returned from the LoginContext * subject. If the AuthorityGranter wishes to grant any authorities, it should return diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java index 8e865213ad..7e7b6cd111 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java @@ -86,14 +86,8 @@ import org.springframework.util.Assert; */ public class DefaultJaasAuthenticationProvider extends AbstractJaasAuthenticationProvider { - // ~ Instance fields - // ================================================================================================ - private Configuration configuration; - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java index 82d978dc3a..76c9922d34 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java @@ -29,9 +29,6 @@ import javax.security.auth.login.LoginException; */ public class DefaultLoginExceptionResolver implements LoginExceptionResolver { - // ~ Methods - // ======================================================================================================== - public AuthenticationException resolveException(LoginException e) { return new AuthenticationServiceException(e.getMessage(), e); } diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java index 703ecb732c..3ee240025e 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java @@ -46,9 +46,6 @@ import org.springframework.security.core.Authentication; */ public interface JaasAuthenticationCallbackHandler { - // ~ Methods - // ======================================================================================================== - /** * Handle the Authentication. diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java index 8cedd283bd..b2548a2893 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java @@ -29,9 +29,6 @@ import org.springframework.context.ApplicationEvent; */ public abstract class JaasAuthenticationEvent extends ApplicationEvent { - // ~ Constructors - // =================================================================================================== - /** * The Authentication object is stored as the ApplicationEvent 'source'. * @param auth @@ -40,9 +37,6 @@ public abstract class JaasAuthenticationEvent extends ApplicationEvent { super(auth); } - // ~ Methods - // ======================================================================================================== - /** * Pre-casted method that returns the 'source' of the event. * @return the Authentication diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java index ca92f0e548..73851f4652 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java @@ -26,22 +26,13 @@ import org.springframework.security.core.Authentication; */ public class JaasAuthenticationFailedEvent extends JaasAuthenticationEvent { - // ~ Instance fields - // ================================================================================================ - private final Exception exception; - // ~ Constructors - // =================================================================================================== - public JaasAuthenticationFailedEvent(Authentication auth, Exception exception) { super(auth); this.exception = exception; } - // ~ Methods - // ======================================================================================================== - public Exception getException() { return exception; } diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java index 9d1690db92..0afa2b882b 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java @@ -28,9 +28,6 @@ import org.springframework.security.core.Authentication; */ public class JaasAuthenticationSuccessEvent extends JaasAuthenticationEvent { - // ~ Constructors - // =================================================================================================== - public JaasAuthenticationSuccessEvent(Authentication auth) { super(auth); } diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java b/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java index 3bd86695a5..eba70cbaf2 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java @@ -36,16 +36,10 @@ import org.springframework.util.Assert; */ public class InMemoryConfiguration extends Configuration { - // ~ Instance fields - // ================================================================================================ - private final AppConfigurationEntry[] defaultConfiguration; private final Map mappedConfigurations; - // ~ Constructors - // =================================================================================================== - /** * Creates a new instance with only a defaultConfiguration. Any configuration name * will result in defaultConfiguration being returned. @@ -82,9 +76,6 @@ public class InMemoryConfiguration extends Configuration { this.defaultConfiguration = defaultConfiguration; } - // ~ Methods - // ======================================================================================================== - @Override public AppConfigurationEntry[] getAppConfigurationEntry(String name) { AppConfigurationEntry[] mappedResult = this.mappedConfigurations.get(name); diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java index 7f44aaf305..fdfece6ba7 100644 --- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java +++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java @@ -33,9 +33,6 @@ public class RemoteAuthenticationException extends NestedRuntimeException { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Constructors - // =================================================================================================== - /** * Constructs a RemoteAuthenticationException with the specified message * and no root cause. diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java index c0e1ac7a05..f2bec46c89 100644 --- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java @@ -27,9 +27,6 @@ import org.springframework.security.core.GrantedAuthority; */ public interface RemoteAuthenticationManager { - // ~ Methods - // ======================================================================================================== - /** * Attempts to authenticate the remote client using the presented username and * password. If authentication is successful, a collection of {@code GrantedAuthority} diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java index 2209d42436..49f2361035 100644 --- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java +++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java @@ -35,14 +35,8 @@ import org.springframework.util.Assert; */ public class RemoteAuthenticationManagerImpl implements RemoteAuthenticationManager, InitializingBean { - // ~ Instance fields - // ================================================================================================ - private AuthenticationManager authenticationManager; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(this.authenticationManager, "authenticationManager is required"); } diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java index b105b1d21c..c08b632004 100644 --- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java @@ -52,14 +52,8 @@ import org.springframework.util.Assert; */ public class RemoteAuthenticationProvider implements AuthenticationProvider, InitializingBean { - // ~ Instance fields - // ================================================================================================ - private RemoteAuthenticationManager remoteAuthenticationManager; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(this.remoteAuthenticationManager, "remoteAuthenticationManager is mandatory"); } diff --git a/core/src/main/java/org/springframework/security/core/Authentication.java b/core/src/main/java/org/springframework/security/core/Authentication.java index 5b762ef72e..12e04fdeb2 100644 --- a/core/src/main/java/org/springframework/security/core/Authentication.java +++ b/core/src/main/java/org/springframework/security/core/Authentication.java @@ -50,9 +50,6 @@ import org.springframework.security.core.context.SecurityContextHolder; */ public interface Authentication extends Principal, Serializable { - // ~ Methods - // ======================================================================================================== - /** * Set by an AuthenticationManager to indicate the authorities that the * principal has been granted. Note that classes should not rely on this value as diff --git a/core/src/main/java/org/springframework/security/core/AuthenticationException.java b/core/src/main/java/org/springframework/security/core/AuthenticationException.java index 1680049188..4826756b39 100644 --- a/core/src/main/java/org/springframework/security/core/AuthenticationException.java +++ b/core/src/main/java/org/springframework/security/core/AuthenticationException.java @@ -24,9 +24,6 @@ package org.springframework.security.core; */ public abstract class AuthenticationException extends RuntimeException { - // ~ Constructors - // =================================================================================================== - /** * Constructs an {@code AuthenticationException} with the specified message and root * cause. diff --git a/core/src/main/java/org/springframework/security/core/GrantedAuthority.java b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java index 52e0d23326..463bf5432f 100644 --- a/core/src/main/java/org/springframework/security/core/GrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java @@ -31,9 +31,6 @@ import org.springframework.security.access.AccessDecisionManager; */ public interface GrantedAuthority extends Serializable { - // ~ Methods - // ======================================================================================================== - /** * If the GrantedAuthority can be represented as a String * and that String is sufficient in precision to be relied upon for an diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java b/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java index 73d65df288..3166e36224 100644 --- a/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java +++ b/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java @@ -33,16 +33,10 @@ import org.springframework.context.support.ResourceBundleMessageSource; */ public class SpringSecurityMessageSource extends ResourceBundleMessageSource { - // ~ Constructors - // =================================================================================================== - public SpringSecurityMessageSource() { setBasename("org.springframework.security.messages"); } - // ~ Methods - // ======================================================================================================== - public static MessageSourceAccessor getAccessor() { return new MessageSourceAccessor(new SpringSecurityMessageSource()); } diff --git a/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java index 218fa5cd5e..284fbdceb9 100644 --- a/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java @@ -29,14 +29,8 @@ import org.springframework.util.Assert; */ final class GlobalSecurityContextHolderStrategy implements SecurityContextHolderStrategy { - // ~ Static fields/initializers - // ===================================================================================== - private static SecurityContext contextHolder; - // ~ Methods - // ======================================================================================================== - public void clearContext() { contextHolder = null; } diff --git a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java index 73e8237593..620a5affcc 100644 --- a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java @@ -27,14 +27,8 @@ import org.springframework.util.Assert; */ final class InheritableThreadLocalSecurityContextHolderStrategy implements SecurityContextHolderStrategy { - // ~ Static fields/initializers - // ===================================================================================== - private static final ThreadLocal contextHolder = new InheritableThreadLocal<>(); - // ~ Methods - // ======================================================================================================== - public void clearContext() { contextHolder.remove(); } diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContext.java b/core/src/main/java/org/springframework/security/core/context/SecurityContext.java index 6c00eb373a..d3da30496e 100644 --- a/core/src/main/java/org/springframework/security/core/context/SecurityContext.java +++ b/core/src/main/java/org/springframework/security/core/context/SecurityContext.java @@ -32,9 +32,6 @@ import java.io.Serializable; */ public interface SecurityContext extends Serializable { - // ~ Methods - // ======================================================================================================== - /** * Obtains the currently authenticated principal, or an authentication request token. * @return the Authentication or null if no authentication diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java index edf187589f..5885922fbc 100644 --- a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java +++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java @@ -49,9 +49,6 @@ import java.lang.reflect.Constructor; */ public class SecurityContextHolder { - // ~ Static fields/initializers - // ===================================================================================== - public static final String MODE_THREADLOCAL = "MODE_THREADLOCAL"; public static final String MODE_INHERITABLETHREADLOCAL = "MODE_INHERITABLETHREADLOCAL"; @@ -70,9 +67,6 @@ public class SecurityContextHolder { initialize(); } - // ~ Methods - // ======================================================================================================== - /** * Explicitly clears the context value from the current thread. */ diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java index b988fd0294..4954db70aa 100644 --- a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java @@ -26,9 +26,6 @@ package org.springframework.security.core.context; */ public interface SecurityContextHolderStrategy { - // ~ Methods - // ======================================================================================================== - /** * Clears the current context. */ diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java index 7eaa747bc8..4cef1edce8 100644 --- a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java +++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java @@ -30,9 +30,6 @@ public class SecurityContextImpl implements SecurityContext { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private Authentication authentication; public SecurityContextImpl() { @@ -42,9 +39,6 @@ public class SecurityContextImpl implements SecurityContext { this.authentication = authentication; } - // ~ Methods - // ======================================================================================================== - @Override public boolean equals(Object obj) { if (obj instanceof SecurityContextImpl) { diff --git a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java index a6c405bbda..fa930c7aa6 100644 --- a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java @@ -28,14 +28,8 @@ import org.springframework.util.Assert; */ final class ThreadLocalSecurityContextHolderStrategy implements SecurityContextHolderStrategy { - // ~ Static fields/initializers - // ===================================================================================== - private static final ThreadLocal contextHolder = new ThreadLocal<>(); - // ~ Methods - // ======================================================================================================== - public void clearContext() { contextHolder.remove(); } diff --git a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java index 09e4be8feb..c31790b57c 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java @@ -41,9 +41,6 @@ public class SessionInformation implements Serializable { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private Date lastRequest; private final Object principal; @@ -52,9 +49,6 @@ public class SessionInformation implements Serializable { private boolean expired = false; - // ~ Constructors - // =================================================================================================== - public SessionInformation(Object principal, String sessionId, Date lastRequest) { Assert.notNull(principal, "Principal required"); Assert.hasText(sessionId, "SessionId required"); @@ -64,9 +58,6 @@ public class SessionInformation implements Serializable { this.lastRequest = lastRequest; } - // ~ Methods - // ======================================================================================================== - public void expireNow() { this.expired = true; } diff --git a/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java b/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java index 017ee8750e..107dfaf54c 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java @@ -25,9 +25,6 @@ import java.util.List; */ public interface SessionRegistry { - // ~ Methods - // ======================================================================================================== - /** * Obtains all the known principals in the SessionRegistry. * @return each of the unique principals, which can then be presented to diff --git a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java index e6f5910557..224f28499b 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java @@ -42,9 +42,6 @@ import java.util.concurrent.CopyOnWriteArraySet; */ public class SessionRegistryImpl implements SessionRegistry, ApplicationListener { - // ~ Instance fields - // ================================================================================================ - protected final Log logger = LogFactory.getLog(SessionRegistryImpl.class); /** */ @@ -53,9 +50,6 @@ public class SessionRegistryImpl implements SessionRegistry, ApplicationListener /** */ private final Map sessionIds; - // ~ Methods - // ======================================================================================================== - public SessionRegistryImpl() { this.principals = new ConcurrentHashMap<>(); this.sessionIds = new ConcurrentHashMap<>(); diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java index 3f256021b1..8ae1964abe 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/User.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java @@ -65,8 +65,6 @@ public class User implements UserDetails, CredentialsContainer { private static final Log logger = LogFactory.getLog(User.class); - // ~ Instance fields - // ================================================================================================ private String password; private final String username; @@ -81,9 +79,6 @@ public class User implements UserDetails, CredentialsContainer { private final boolean enabled; - // ~ Constructors - // =================================================================================================== - /** * Calls the more complex constructor with all boolean arguments set to {@code true}. */ @@ -125,9 +120,6 @@ public class User implements UserDetails, CredentialsContainer { this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities)); } - // ~ Methods - // ======================================================================================================== - public Collection getAuthorities() { return authorities; } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java index da71d3f6ef..922413ce2e 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java @@ -37,9 +37,6 @@ package org.springframework.security.core.userdetails; */ public interface UserCache { - // ~ Methods - // ======================================================================================================== - /** * Obtains a {@link UserDetails} from the cache. * @param username the {@link User#getUsername()} used to place the user in the cache diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java index e4a652489b..ff9b3b50f0 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java @@ -42,9 +42,6 @@ import java.util.Collection; */ public interface UserDetails extends Serializable { - // ~ Methods - // ======================================================================================================== - /** * Returns the authorities granted to the user. Cannot return null. * @return the authorities, sorted by natural key (never null) diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java index 4350d06fff..e48fb2c9da 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java @@ -33,9 +33,6 @@ package org.springframework.security.core.userdetails; */ public interface UserDetailsService { - // ~ Methods - // ======================================================================================================== - /** * Locates the user based on the username. In the actual implementation, the search * may possibly be case sensitive, or case insensitive depending on how the diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java b/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java index 6851e3a1b5..2894852d33 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java @@ -26,9 +26,6 @@ import org.springframework.security.core.AuthenticationException; */ public class UsernameNotFoundException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a UsernameNotFoundException with the specified message. * @param msg the detail message. diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java index 3fdf210395..1224ef2204 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java @@ -34,19 +34,10 @@ import org.springframework.util.Assert; */ public class EhCacheBasedUserCache implements UserCache, InitializingBean { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(EhCacheBasedUserCache.class); - // ~ Instance fields - // ================================================================================================ - private Ehcache cache; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(cache, "cache mandatory"); } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java index a56f5d1672..5a8a0008d6 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java @@ -26,9 +26,6 @@ import org.springframework.security.core.userdetails.UserDetails; */ public class NullUserCache implements UserCache { - // ~ Methods - // ======================================================================================================== - public UserDetails getUserFromCache(String username) { return null; } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java index b54a5dbf3b..18007ff77d 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java @@ -30,27 +30,15 @@ import org.springframework.util.Assert; */ public class SpringCacheBasedUserCache implements UserCache { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(SpringCacheBasedUserCache.class); - // ~ Instance fields - // ================================================================================================ - private final Cache cache; - // ~ Constructors - // =================================================================================================== - public SpringCacheBasedUserCache(Cache cache) { Assert.notNull(cache, "cache mandatory"); this.cache = cache; } - // ~ Methods - // ======================================================================================================== - public UserDetails getUserFromCache(String username) { Cache.ValueWrapper element = username != null ? cache.get(username) : null; diff --git a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java index 104c89814b..565c28b7a9 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java @@ -109,9 +109,6 @@ import org.springframework.util.Assert; */ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - public static final String DEF_USERS_BY_USERNAME_QUERY = "select username,password,enabled " + "from users " + "where username = ?"; @@ -122,9 +119,6 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, M + "from groups g, group_members gm, group_authorities ga " + "where gm.username = ? " + "and g.id = ga.group_id " + "and g.id = gm.group_id"; - // ~ Instance fields - // ================================================================================================ - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private String authoritiesByUsernameQuery; @@ -141,18 +135,12 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, M private boolean enableGroups; - // ~ Constructors - // =================================================================================================== - public JdbcDaoImpl() { this.usersByUsernameQuery = DEF_USERS_BY_USERNAME_QUERY; this.authoritiesByUsernameQuery = DEF_AUTHORITIES_BY_USERNAME_QUERY; this.groupAuthoritiesByUsernameQuery = DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY; } - // ~ Methods - // ======================================================================================================== - /** * @return the messages */ diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java index 5e380c780b..64f8ab9179 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java @@ -31,18 +31,12 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; */ public class UserAttribute { - // ~ Instance fields - // ================================================================================================ - private List authorities = new Vector<>(); private String password; private boolean enabled = true; - // ~ Methods - // ======================================================================================================== - public void addAuthority(GrantedAuthority newAuthority) { this.authorities.add(newAuthority); } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java index ffe713b5ae..64914495d5 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java @@ -30,9 +30,6 @@ import org.springframework.util.StringUtils; */ public class UserAttributeEditor extends PropertyEditorSupport { - // ~ Methods - // ======================================================================================================== - public void setAsText(String s) throws IllegalArgumentException { if (StringUtils.hasText(s)) { String[] tokens = StringUtils.commaDelimitedListToStringArray(s); diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java index 2808a9da21..59c4ea67cb 100644 --- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java @@ -58,9 +58,6 @@ import java.util.List; */ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsManager, GroupManager { - // ~ Static fields/initializers - // ===================================================================================== - // UserDetailsManager SQL public static final String DEF_CREATE_USER_SQL = "insert into users (username, password, enabled) values (?,?,?)"; @@ -105,9 +102,6 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public static final String DEF_DELETE_GROUP_AUTHORITY_SQL = "delete from group_authorities where group_id = ? and authority = ?"; - // ~ Instance fields - // ================================================================================================ - protected final Log logger = LogFactory.getLog(getClass()); private String createUserSql = DEF_CREATE_USER_SQL; @@ -161,9 +155,6 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa setDataSource(dataSource); } - // ~ Methods - // ======================================================================================================== - protected void initDao() throws ApplicationContextException { if (authenticationManager == null) { logger.info("No authentication manager set. Reauthentication of users when changing passwords will " @@ -173,9 +164,6 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa super.initDao(); } - // ~ UserDetailsManager implementation - // ============================================================================== - /** * Executes the SQL usersByUsernameQuery and returns a list of UserDetails * objects. There should normally only be one matching user. @@ -324,9 +312,6 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa return users.size() == 1; } - // ~ GroupManager implementation - // ==================================================================================== - public List findAllGroups() { return getJdbcTemplate().queryForList(findAllGroupsSql, String.class); } diff --git a/core/src/main/java/org/springframework/security/util/FieldUtils.java b/core/src/main/java/org/springframework/security/util/FieldUtils.java index 663ff43b4e..23b5f873be 100644 --- a/core/src/main/java/org/springframework/security/util/FieldUtils.java +++ b/core/src/main/java/org/springframework/security/util/FieldUtils.java @@ -29,8 +29,6 @@ import java.lang.reflect.Field; */ public final class FieldUtils { - // ~ Methods - // ======================================================================================================== /** * Attempts to locate the specified field on the class. * @param clazz the class definition containing the field diff --git a/core/src/main/java/org/springframework/security/util/InMemoryResource.java b/core/src/main/java/org/springframework/security/util/InMemoryResource.java index 61ea2cea71..af84259c82 100644 --- a/core/src/main/java/org/springframework/security/util/InMemoryResource.java +++ b/core/src/main/java/org/springframework/security/util/InMemoryResource.java @@ -34,16 +34,10 @@ import java.util.Arrays; */ public class InMemoryResource extends AbstractResource { - // ~ Instance fields - // ================================================================================================ - private final byte[] source; private final String description; - // ~ Constructors - // =================================================================================================== - public InMemoryResource(String source) { this(source.getBytes()); } @@ -58,9 +52,6 @@ public class InMemoryResource extends AbstractResource { this.description = description; } - // ~ Methods - // ======================================================================================================== - @Override public String getDescription() { return description; diff --git a/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java b/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java index 1b49cd2ec0..723a6b1d32 100644 --- a/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java +++ b/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java @@ -34,9 +34,6 @@ import org.springframework.util.Assert; */ public final class MethodInvocationUtils { - // ~ Methods - // ======================================================================================================== - /** * Generates a MethodInvocation for specified methodName on * the passed object, using the args to locate the method. diff --git a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java index ec16f61f44..7439b7c31a 100644 --- a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java +++ b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java @@ -28,18 +28,12 @@ import java.lang.reflect.Method; */ public class SimpleMethodInvocation implements MethodInvocation { - // ~ Instance fields - // ================================================================================================ - private Method method; private Object[] arguments; private Object targetObject; - // ~ Constructors - // =================================================================================================== - public SimpleMethodInvocation(Object targetObject, Method method, Object... arguments) { this.targetObject = targetObject; this.method = method; @@ -49,9 +43,6 @@ public class SimpleMethodInvocation implements MethodInvocation { public SimpleMethodInvocation() { } - // ~ Methods - // ======================================================================================================== - public Object[] getArguments() { return arguments; } diff --git a/core/src/test/java/org/springframework/security/ITargetObject.java b/core/src/test/java/org/springframework/security/ITargetObject.java index 46efcfd133..b091350bb9 100644 --- a/core/src/test/java/org/springframework/security/ITargetObject.java +++ b/core/src/test/java/org/springframework/security/ITargetObject.java @@ -23,9 +23,6 @@ package org.springframework.security; */ public interface ITargetObject { - // ~ Methods - // ======================================================================================================== - Integer computeHashCode(String input); int countLength(String input); diff --git a/core/src/test/java/org/springframework/security/OtherTargetObject.java b/core/src/test/java/org/springframework/security/OtherTargetObject.java index 32722f405a..f0bf745f41 100644 --- a/core/src/test/java/org/springframework/security/OtherTargetObject.java +++ b/core/src/test/java/org/springframework/security/OtherTargetObject.java @@ -35,9 +35,6 @@ package org.springframework.security; */ public class OtherTargetObject extends TargetObject implements ITargetObject { - // ~ Methods - // ======================================================================================================== - public String makeLowerCase(String input) { return super.makeLowerCase(input); } diff --git a/core/src/test/java/org/springframework/security/PopulatedDatabase.java b/core/src/test/java/org/springframework/security/PopulatedDatabase.java index 8c3774bacb..f341fd7b75 100644 --- a/core/src/test/java/org/springframework/security/PopulatedDatabase.java +++ b/core/src/test/java/org/springframework/security/PopulatedDatabase.java @@ -28,20 +28,11 @@ import javax.sql.DataSource; */ public class PopulatedDatabase { - // ~ Static fields/initializers - // ===================================================================================== - private static TestDataSource dataSource = null; - // ~ Constructors - // =================================================================================================== - private PopulatedDatabase() { } - // ~ Methods - // ======================================================================================================== - public static DataSource getDataSource() { if (dataSource == null) { setupDataSource(); diff --git a/core/src/test/java/org/springframework/security/TargetObject.java b/core/src/test/java/org/springframework/security/TargetObject.java index 1ab1de4b5c..abc72f8849 100644 --- a/core/src/test/java/org/springframework/security/TargetObject.java +++ b/core/src/test/java/org/springframework/security/TargetObject.java @@ -26,9 +26,6 @@ import org.springframework.security.core.context.SecurityContextHolder; */ public class TargetObject implements ITargetObject { - // ~ Methods - // ======================================================================================================== - public Integer computeHashCode(String input) { return input.hashCode(); } diff --git a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java index 6d99bd488b..1b2a1b7d5e 100644 --- a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java +++ b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java @@ -29,9 +29,6 @@ import org.springframework.security.access.SecurityConfig; */ public class SecurityConfigTests { - // ~ Methods - // ======================================================================================================== - @Test public void testHashCode() { SecurityConfig config = new SecurityConfig("TEST"); @@ -85,9 +82,6 @@ public class SecurityConfigTests { assertThat(config.toString()).isEqualTo("TEST"); } - // ~ Inner Classes - // ================================================================================================== - private class MockConfigAttribute implements ConfigAttribute { private String attribute; diff --git a/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java index eff3ff65a6..16c63b7e28 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java +++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java @@ -30,9 +30,6 @@ import org.springframework.security.access.prepost.PreAuthorize; @PermitAll public interface BusinessService extends Serializable { - // ~ Methods - // ======================================================================================================== - @Secured({ "ROLE_ADMIN" }) @RolesAllowed({ "ROLE_ADMIN" }) @PreAuthorize("hasRole('ROLE_ADMIN')") diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java index 7e78a22718..4feb54a5ed 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java @@ -202,9 +202,6 @@ public class Jsr250MethodSecurityMetadataSourceTests { assertThat(accessAttributes.toArray()[0].toString()).isEqualTo("ROLE_DERIVED"); } - // ~ Inner Classes - // ====================================================================================================== - public static class A { public void noRoleMethod() { diff --git a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java index d9364734c8..147c2a55f7 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java @@ -48,14 +48,8 @@ import org.springframework.security.core.GrantedAuthority; */ public class SecuredAnnotationSecurityMetadataSourceTests { - // ~ Instance fields - // ================================================================================================ - private SecuredAnnotationSecurityMetadataSource mds = new SecuredAnnotationSecurityMetadataSource(); - // ~ Methods - // ======================================================================================================== - @Test public void genericsSuperclassDeclarationsAreIncludedWhenSubclassesOverride() { Method method = null; diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java index ec66b1ae3b..ae7bab6565 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java @@ -147,9 +147,6 @@ public class MethodExpressionVoterTests { return Target.class.getMethod("methodTakingACollection", Collection.class); } - // ~ Inner Classes - // ================================================================================================== - private interface Target { void methodTakingAnArray(Object[] args); diff --git a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java index ef0c9abbc2..f648b9c6b8 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java @@ -190,9 +190,6 @@ public class PrePostAnnotationSecurityMetadataSourceTests { assertThat(expression.getExpressionString()).isEqualTo("hasRole('ROLE_PERSON')"); } - // ~ Inner Classes - // ================================================================================================== - public interface ReturnVoid { void doSomething(List param); diff --git a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java index 7ea4f8eb2e..7546358198 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java @@ -32,9 +32,6 @@ import org.springframework.security.util.SimpleMethodInvocation; */ public class AbstractSecurityInterceptorTests { - // ~ Methods - // ======================================================================================================== - @Test(expected = IllegalArgumentException.class) public void detectsIfInvocationPassedIncompatibleSecureObject() { MockSecurityInterceptorWhichOnlySupportsStrings si = new MockSecurityInterceptorWhichOnlySupportsStrings(); @@ -58,9 +55,6 @@ public class AbstractSecurityInterceptorTests { si.afterPropertiesSet(); } - // ~ Inner Classes - // ================================================================================================== - private class MockSecurityInterceptorReturnsNull extends AbstractSecurityInterceptor { private SecurityMetadataSource securityMetadataSource; diff --git a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java index d2439954ab..686b323593 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java @@ -40,8 +40,6 @@ import org.springframework.security.util.SimpleMethodInvocation; @SuppressWarnings("unchecked") public class AfterInvocationProviderManagerTests { - // ~ Methods - // ======================================================================================================== @Test public void testCorrectOperation() throws Exception { AfterInvocationProviderManager manager = new AfterInvocationProviderManager(); @@ -147,9 +145,6 @@ public class AfterInvocationProviderManagerTests { assertThat(manager.supports(MethodInvocation.class)).isTrue(); } - // ~ Inner Classes - // ================================================================================================== - /** * Always returns the constructor-defined forceReturnObject, provided the * same configuration attribute was provided. Also stores the secure object it diff --git a/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java index 8f8ca85e0a..cd83bb1510 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java @@ -28,9 +28,6 @@ import org.springframework.security.access.SecurityConfig; */ public class NullRunAsManagerTests { - // ~ Methods - // ======================================================================================================== - @Test public void testAlwaysReturnsNull() { NullRunAsManager runAs = new NullRunAsManager(); diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java index eff1830caf..af5f365919 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java @@ -71,9 +71,6 @@ public class MethodSecurityInterceptorTests { private ApplicationEventPublisher eventPublisher; - // ~ Methods - // ======================================================================================================== - @Before public final void setUp() { SecurityContextHolder.clearContext(); diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java index 88e83036b2..7330bd524c 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java @@ -34,8 +34,6 @@ import org.springframework.security.access.method.MethodSecurityMetadataSource; */ public class MethodSecurityMetadataSourceAdvisorTests { - // ~ Methods - // ======================================================================================================== @Test public void testAdvisorReturnsFalseWhenMethodInvocationNotDefined() throws Exception { Class clazz = TargetObject.class; diff --git a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java index 593db48047..ebc5d5eddf 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java @@ -69,9 +69,6 @@ public class AspectJMethodSecurityInterceptorTests { private ProceedingJoinPoint joinPoint; - // ~ Methods - // ======================================================================================================== - @Before public final void setUp() { MockitoAnnotations.initMocks(this); diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java index bc7db2355b..377e301b5f 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java @@ -58,9 +58,6 @@ public class MethodInvocationPrivilegeEvaluatorTests { private final List role = SecurityConfig.createList("ROLE_IGNORED"); - // ~ Methods - // ======================================================================================================== - @Before public final void setUp() { SecurityContextHolder.clearContext(); diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java index fbf69e25c3..e3ad93ee39 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java @@ -37,8 +37,6 @@ import org.springframework.security.core.Authentication; @SuppressWarnings("unchecked") public class AbstractAccessDecisionManagerTests { - // ~ Methods - // ======================================================================================================== @Test public void testAllowIfAccessDecisionManagerDefaults() { List list = new Vector(); @@ -131,9 +129,6 @@ public class AbstractAccessDecisionManagerTests { } } - // ~ Inner Classes - // ================================================================================================== - private class MockDecisionManagerImpl extends AbstractAccessDecisionManager { protected MockDecisionManagerImpl(List> decisionVoters) { diff --git a/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java b/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java index c51074d0f0..7f2dc3e970 100644 --- a/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java +++ b/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java @@ -35,9 +35,6 @@ import java.util.Iterator; */ public class DenyAgainVoter implements AccessDecisionVoter { - // ~ Methods - // ======================================================================================================== - public boolean supports(ConfigAttribute attribute) { if ("DENY_AGAIN_FOR_SURE".equals(attribute.getAttribute())) { return true; diff --git a/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java b/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java index d30ba67749..05248fc1c8 100644 --- a/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java +++ b/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java @@ -37,9 +37,6 @@ import java.util.Iterator; */ public class DenyVoter implements AccessDecisionVoter { - // ~ Methods - // ======================================================================================================== - public boolean supports(ConfigAttribute attribute) { if ("DENY_FOR_SURE".equals(attribute.getAttribute())) { return true; diff --git a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java index ab147f7399..d8507a9fc0 100644 --- a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java +++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java @@ -23,21 +23,12 @@ package org.springframework.security.access.vote; */ public class SomeDomainObject { - // ~ Instance fields - // ================================================================================================ - private String identity; - // ~ Constructors - // =================================================================================================== - public SomeDomainObject(String identity) { this.identity = identity; } - // ~ Methods - // ======================================================================================================== - public String getParent() { return "parentOf" + identity; } diff --git a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java index e8b4547c4e..abde87e604 100644 --- a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java +++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java @@ -24,9 +24,6 @@ package org.springframework.security.access.vote; */ public class SomeDomainObjectManager { - // ~ Methods - // ======================================================================================================== - public void someServiceMethod(SomeDomainObject someDomainObject) { } diff --git a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java index 93e3112e37..fe35268abb 100644 --- a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java @@ -36,9 +36,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken; */ public class UnanimousBasedTests { - // ~ Methods - // ======================================================================================================== - private UnanimousBased makeDecisionManager() { RoleVoter roleVoter = new RoleVoter(); DenyVoter denyForSureVoter = new DenyVoter(); diff --git a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java index 72c63c6aa9..34907dfba1 100644 --- a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java @@ -34,14 +34,8 @@ import java.util.*; */ public class AbstractAuthenticationTokenTests { - // ~ Instance fields - // ================================================================================================ - private List authorities = null; - // ~ Methods - // ======================================================================================================== - @Before public final void setUp() { authorities = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); @@ -136,9 +130,6 @@ public class AbstractAuthenticationTokenTests { verify(principal, times(1)).getName(); } - // ~ Inner Classes - // ================================================================================================== - private class MockAuthenticationImpl extends AbstractAuthenticationToken { private Object credentials; diff --git a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java index 963332b501..e43662de7f 100644 --- a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java @@ -29,8 +29,6 @@ import org.springframework.security.core.authority.AuthorityUtils; */ public class AuthenticationTrustResolverImplTests { - // ~ Methods - // ======================================================================================================== @Test public void testCorrectOperationIsAnonymous() { AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl(); diff --git a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java index 8de0dfdcb0..428adb17e6 100644 --- a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java @@ -358,9 +358,6 @@ public class ProviderManagerTests { return new ProviderManager(provider); } - // ~ Inner Classes - // ================================================================================================== - private static class MockProvider implements AuthenticationProvider { public Authentication authenticate(Authentication authentication) throws AuthenticationException { diff --git a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java index 4f93382b33..49bce2def9 100644 --- a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java @@ -29,9 +29,6 @@ import org.springframework.security.core.authority.AuthorityUtils; */ public class UsernamePasswordAuthenticationTokenTests { - // ~ Methods - // ======================================================================================================== - @Test public void authenticatedPropertyContractIsSatisfied() { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password", diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java index d1aed04429..a807bcb8dc 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java @@ -33,9 +33,6 @@ import org.springframework.security.core.authority.AuthorityUtils; */ public class AnonymousAuthenticationProviderTests { - // ~ Methods - // ======================================================================================================== - @Test public void testDetectsAnInvalidKey() { AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider("qwerty"); diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java index 544aaef640..943d6a5f7c 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java @@ -37,8 +37,6 @@ public class AnonymousAuthenticationTokenTests { private final static List ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); - // ~ Methods - // ======================================================================================================== @Test public void testConstructorRejectsNulls() { try { diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java index 8ac4bc9f26..76447924f1 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java @@ -70,8 +70,6 @@ public class DaoAuthenticationProviderTests { private static final List ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); - // ~ Methods - // ======================================================================================================== @Test public void testAuthenticateFailsForIncorrectPasswordCase() { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "KOala"); @@ -684,9 +682,6 @@ public class DaoAuthenticationProviderTests { verify(encoder, times(0)).matches(anyString(), anyString()); } - // ~ Inner Classes - // ================================================================================================== - private class MockUserDetailsServiceReturnsNull implements UserDetailsService { public UserDetails loadUserByUsername(String username) { diff --git a/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java b/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java index 786ebd3e12..d8df1bb25f 100644 --- a/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java +++ b/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java @@ -32,9 +32,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationEventTests { - // ~ Methods - // ======================================================================================================== - private Authentication getAuthentication() { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("Principal", "Credentials"); diff --git a/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java b/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java index 1d31a2990a..c8eaabb4dd 100644 --- a/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java @@ -28,9 +28,6 @@ import org.springframework.security.core.Authentication; */ public class LoggerListenerTests { - // ~ Methods - // ======================================================================================================== - private Authentication getAuthentication() { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("Principal", "Credentials"); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index fb4c832ec7..a506b24bfd 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -52,18 +52,12 @@ import org.springframework.security.core.session.SessionDestroyedEvent; */ public class JaasAuthenticationProviderTests { - // ~ Instance fields - // ================================================================================================ - private ApplicationContext context; private JaasAuthenticationProvider jaasProvider; private JaasEventCheck eventCheck; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { String resName = "/" + getClass().getName().replace('.', '/') + ".xml"; @@ -284,9 +278,6 @@ public class JaasAuthenticationProviderTests { .isNull(); } - // ~ Inner Classes - // ================================================================================================== - private static class MockLoginContext extends LoginContext { boolean loggedOut = false; diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java index 68c5b61613..fb42097d7c 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java @@ -26,16 +26,10 @@ import org.springframework.security.authentication.jaas.event.JaasAuthentication */ public class JaasEventCheck implements ApplicationListener { - // ~ Instance fields - // ================================================================================================ - JaasAuthenticationFailedEvent failedEvent; JaasAuthenticationSuccessEvent successEvent; - // ~ Methods - // ======================================================================================================== - public void onApplicationEvent(JaasAuthenticationEvent event) { if (event instanceof JaasAuthenticationFailedEvent) { failedEvent = (JaasAuthenticationFailedEvent) event; diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java index 9d47287550..dd992af4b0 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java @@ -40,9 +40,6 @@ import static org.assertj.core.api.Assertions.fail; */ public class SecurityContextLoginModuleTests { - // ~ Instance fields - // ================================================================================================ - private SecurityContextLoginModule module = null; private Subject subject = new Subject(false, new HashSet<>(), new HashSet<>(), new HashSet<>()); @@ -50,9 +47,6 @@ public class SecurityContextLoginModuleTests { private UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("principal", "credentials"); - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { this.module = new SecurityContextLoginModule(); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java index e8ab46cf2a..379e88fd75 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java @@ -28,9 +28,6 @@ import org.springframework.security.authentication.jaas.AuthorityGranter; */ public class TestAuthorityGranter implements AuthorityGranter { - // ~ Methods - // ======================================================================================================== - public Set grant(Principal principal) { Set rtnSet = new HashSet<>(); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java index 1d222f0689..74af5cc789 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java @@ -29,9 +29,6 @@ import javax.security.auth.callback.TextInputCallback; */ public class TestCallbackHandler implements JaasAuthenticationCallbackHandler { - // ~ Methods - // ======================================================================================================== - public void handle(Callback callback, Authentication auth) { if (callback instanceof TextInputCallback) { TextInputCallback tic = (TextInputCallback) callback; diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java index d7a6c4f3e3..6a283f02c6 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java @@ -28,18 +28,12 @@ import javax.security.auth.spi.LoginModule; */ public class TestLoginModule implements LoginModule { - // ~ Instance fields - // ================================================================================================ - private String password; private String user; private Subject subject; - // ~ Methods - // ======================================================================================================== - public boolean abort() { return true; } diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java index cd50afa5b6..b255f4a3e9 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java @@ -32,9 +32,6 @@ import org.springframework.security.core.Authentication; */ public class RemoteAuthenticationManagerImplTests { - // ~ Methods - // ======================================================================================================== - @Test(expected = RemoteAuthenticationException.class) public void testFailedAuthenticationReturnsRemoteAuthenticationException() { RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl(); diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java index 8e35e05037..d3c78640da 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java @@ -35,9 +35,6 @@ import static org.assertj.core.api.Assertions.fail; */ public class RemoteAuthenticationProviderTests { - // ~ Methods - // ======================================================================================================== - @Test public void testExceptionsGetPassedBackToCaller() { RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider(); @@ -107,9 +104,6 @@ public class RemoteAuthenticationProviderTests { assertThat(provider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); } - // ~ Inner Classes - // ================================================================================================== - private class MockRemoteAuthenticationManager implements RemoteAuthenticationManager { private boolean grantAccess; diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java index e481cb8a91..3673f6b05e 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java @@ -35,8 +35,6 @@ import static org.assertj.core.api.Assertions.fail; */ public class RememberMeAuthenticationProviderTests { - // ~ Methods - // ======================================================================================================== @Test public void testDetectsAnInvalidKey() { RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider("qwerty"); diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java index b5ef5417d4..c8173dfc90 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java @@ -36,8 +36,6 @@ public class RememberMeAuthenticationTokenTests { private static final List ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); - // ~ Methods - // ======================================================================================================== @Test public void testConstructorRejectsNulls() { try { diff --git a/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java b/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java index 909ab4e9cf..03b705ed65 100644 --- a/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java +++ b/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java @@ -29,8 +29,6 @@ import org.springframework.context.support.MessageSourceAccessor; */ public class SpringSecurityMessageSourceTests { - // ~ Methods - // ======================================================================================================== @Test public void testOperation() { SpringSecurityMessageSource msgs = new SpringSecurityMessageSource(); diff --git a/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java b/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java index b1141b60c9..c0f95dbe27 100644 --- a/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java +++ b/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java @@ -30,8 +30,6 @@ import org.springframework.security.core.context.SecurityContextImpl; */ public class SecurityContextHolderTests { - // ~ Methods - // ======================================================================================================== @Before public final void setUp() { SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL); diff --git a/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java b/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java index e012fb4a12..a796a38b35 100644 --- a/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java +++ b/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java @@ -29,8 +29,6 @@ import org.springframework.security.core.Authentication; */ public class SecurityContextImplTests { - // ~ Methods - // ======================================================================================================== @Test public void testEmptyObjectsAreEquals() { SecurityContextImpl obj1 = new SecurityContextImpl(); diff --git a/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java b/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java index c7123048aa..8da1c9008a 100644 --- a/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java +++ b/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java @@ -29,8 +29,6 @@ import org.junit.Test; */ public class SessionInformationTests { - // ~ Methods - // ======================================================================================================== @Test public void testObject() throws Exception { Object principal = "Some principal object"; diff --git a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java index 411b982293..55e2b6d6be 100644 --- a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java +++ b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java @@ -37,9 +37,6 @@ public class SessionRegistryImplTests { private SessionRegistryImpl sessionRegistry; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { sessionRegistry = new SessionRegistryImpl(); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java index 52d3503d63..198684ab3e 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java @@ -39,9 +39,6 @@ public class UserTests { private static final List ROLE_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); - // ~ Methods - // ======================================================================================================== - @Test public void equalsReturnsTrueIfUsernamesAreTheSame() { User user1 = new User("rod", "koala", true, true, true, true, ROLE_12); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java index 5f77e6137b..c429ac2939 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java @@ -37,8 +37,6 @@ public class EhCacheBasedUserCacheTests { private static CacheManager cacheManager; - // ~ Methods - // ======================================================================================================== @BeforeClass public static void initCacheManaer() { cacheManager = CacheManager.create(); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java index a61a797ab9..614387a7fd 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java @@ -29,9 +29,6 @@ import org.springframework.security.core.userdetails.User; */ public class NullUserCacheTests { - // ~ Methods - // ======================================================================================================== - private User getUser() { return new User("john", "password", true, true, true, true, AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO")); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java index c4135724f4..8d37b8e11c 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java @@ -39,8 +39,6 @@ public class SpringCacheBasedUserCacheTests { private static CacheManager cacheManager; - // ~ Methods - // ======================================================================================================== @BeforeClass public static void initCacheManaer() { cacheManager = new ConcurrentMapCacheManager(); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java index 0980ba1ee0..bfad0a615e 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java @@ -39,9 +39,6 @@ import static org.mockito.Mockito.verify; */ public class JdbcDaoImplTests { - // ~ Methods - // ======================================================================================================== - private JdbcDaoImpl makePopulatedJdbcDao() { JdbcDaoImpl dao = new JdbcDaoImpl(); dao.setDataSource(PopulatedDatabase.getDataSource()); diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java index 0ee12c20eb..a698244f23 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java @@ -45,9 +45,6 @@ import java.util.Base64; @Deprecated public class LdapShaPasswordEncoder implements PasswordEncoder { - // ~ Static fields/initializers - // ===================================================================================== - /** The number of bytes in a SHA hash */ private static final int SHA_LENGTH = 20; @@ -59,15 +56,10 @@ public class LdapShaPasswordEncoder implements PasswordEncoder { private static final String SHA_PREFIX_LC = SHA_PREFIX.toLowerCase(); - // ~ Instance fields - // ================================================================================================ private BytesKeyGenerator saltGenerator; private boolean forceLowerCasePrefix; - // ~ Constructors - // =================================================================================================== - public LdapShaPasswordEncoder() { this(KeyGenerators.secureRandom()); } @@ -79,9 +71,6 @@ public class LdapShaPasswordEncoder implements PasswordEncoder { this.saltGenerator = saltGenerator; } - // ~ Methods - // ======================================================================================================== - private byte[] combineHashAndSalt(byte[] hash, byte[] salt) { if (salt == null) { return hash; diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/LdapShaPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/LdapShaPasswordEncoderTests.java index 37c20b8956..99b6021f0b 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/LdapShaPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/LdapShaPasswordEncoderTests.java @@ -29,14 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings("deprecation") public class LdapShaPasswordEncoderTests { - // ~ Instance fields - // ================================================================================================ - LdapShaPasswordEncoder sha = new LdapShaPasswordEncoder(); - // ~ Methods - // ======================================================================================================== - @Test public void invalidPasswordFails() { assertThat(this.sha.matches("wrongpassword", "{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=")).isFalse(); diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/MessageDigestPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/MessageDigestPasswordEncoderTests.java index 7e62c413fc..a430e8108e 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/MessageDigestPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/MessageDigestPasswordEncoderTests.java @@ -33,9 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings("deprecation") public class MessageDigestPasswordEncoderTests { - // ~ Methods - // ======================================================================================================== - @Test public void md5BasicFunctionality() { MessageDigestPasswordEncoder pe = new MessageDigestPasswordEncoder("MD5"); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index c4bfe8b50b..c68fc51bc5 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -46,17 +46,11 @@ import org.springframework.test.context.junit4.SpringRunner; @ContextConfiguration(classes = ApacheDsContainerConfig.class) public class SpringSecurityLdapTemplateITests { - // ~ Instance fields - // ================================================================================================ - @Autowired private DefaultSpringSecurityContextSource contextSource; private SpringSecurityLdapTemplate template; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { template = new SpringSecurityLdapTemplate(this.contextSource); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java index 6530c7794c..e574a396f5 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java @@ -45,9 +45,6 @@ import static org.assertj.core.api.Assertions.fail; @ContextConfiguration(classes = ApacheDsContainerConfig.class) public class BindAuthenticatorTests { - // ~ Instance fields - // ================================================================================================ - @Autowired private DefaultSpringSecurityContextSource contextSource; @@ -55,9 +52,6 @@ public class BindAuthenticatorTests { private Authentication bob; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { this.authenticator = new BindAuthenticator(this.contextSource); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java index 11ecffcf65..0e11271e20 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java @@ -47,9 +47,6 @@ import static org.assertj.core.api.Assertions.*; @ContextConfiguration(classes = ApacheDsContainerConfig.class) public class PasswordComparisonAuthenticatorTests { - // ~ Instance fields - // ================================================================================================ - @Autowired private DefaultSpringSecurityContextSource contextSource; @@ -59,9 +56,6 @@ public class PasswordComparisonAuthenticatorTests { private Authentication ben; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { authenticator = new PasswordComparisonAuthenticator(this.contextSource); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java index 052c604af8..fe8f635ad8 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java @@ -50,9 +50,6 @@ public class DefaultLdapAuthoritiesPopulatorTests { private DefaultLdapAuthoritiesPopulator populator; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, "ou=groups"); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java index 892b542ede..04aeb47b39 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java @@ -58,9 +58,6 @@ public class NestedLdapAuthoritiesPopulatorTests { private LdapAuthority circularJavaDevelopers; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { populator = new NestedLdapAuthoritiesPopulator(this.contextSource, "ou=jdeveloper"); diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java index bab3457013..3568bf4fe9 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java +++ b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java @@ -37,20 +37,11 @@ import java.net.URISyntaxException; */ public final class LdapUtils { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(LdapUtils.class); - // ~ Constructors - // =================================================================================================== - private LdapUtils() { } - // ~ Methods - // ======================================================================================================== - public static void closeContext(Context ctx) { if (ctx instanceof DirContextAdapter) { return; diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java index 1d447287f3..d0ca97112b 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java +++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java @@ -55,8 +55,6 @@ import java.util.Set; */ public class SpringSecurityLdapTemplate extends LdapTemplate { - // ~ Static fields/initializers - // ===================================================================================== private static final Log logger = LogFactory.getLog(SpringSecurityLdapTemplate.class); public static final String[] NO_ATTRS = new String[0]; @@ -69,15 +67,9 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { private static final boolean RETURN_OBJECT = true; - // ~ Instance fields - // ================================================================================================ - /** Default search controls */ private SearchControls searchControls = new SearchControls(); - // ~ Constructors - // =================================================================================================== - public SpringSecurityLdapTemplate(ContextSource contextSource) { Assert.notNull(contextSource, "ContextSource cannot be null"); setContextSource(contextSource); @@ -85,9 +77,6 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE); } - // ~ Methods - // ======================================================================================================== - /** * Performs an LDAP compare operation of the value of an attribute for a particular * directory entry. diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java index 43d13eb4dc..599f5d04b1 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java @@ -37,9 +37,6 @@ import java.util.List; */ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, InitializingBean, MessageSourceAware { - // ~ Instance fields - // ================================================================================================ - private final ContextSource contextSource; /** @@ -60,9 +57,6 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, In /** Stores the patterns which are used as potential DN matches */ private MessageFormat[] userDnFormat = null; - // ~ Constructors - // =================================================================================================== - /** * Create an initialized instance with the {@link ContextSource} provided. * @param contextSource @@ -72,9 +66,6 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, In this.contextSource = contextSource; } - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.isTrue((userDnFormat != null) || (userSearch != null), "Either an LdapUserSearch or DN pattern (or both) must be supplied."); diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java index a3433f094a..145456bc47 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java @@ -43,14 +43,8 @@ import javax.naming.directory.DirContext; */ public class BindAuthenticator extends AbstractLdapAuthenticator { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(BindAuthenticator.class); - // ~ Constructors - // =================================================================================================== - /** * Create an initialized instance using the {@link BaseLdapPathContextSource} * provided. @@ -62,9 +56,6 @@ public class BindAuthenticator extends AbstractLdapAuthenticator { super(contextSource); } - // ~ Methods - // ======================================================================================================== - public DirContextOperations authenticate(Authentication authentication) { DirContextOperations user = null; Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication, diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java index f2ab6ae526..6cf5d300b2 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java @@ -117,18 +117,12 @@ import org.springframework.util.Assert; */ public class LdapAuthenticationProvider extends AbstractLdapAuthenticationProvider { - // ~ Instance fields - // ================================================================================================ - private LdapAuthenticator authenticator; private LdapAuthoritiesPopulator authoritiesPopulator; private boolean hideUserNotFoundExceptions = true; - // ~ Constructors - // =================================================================================================== - /** * Create an instance with the supplied authenticator and authorities populator * implementations. @@ -152,9 +146,6 @@ public class LdapAuthenticationProvider extends AbstractLdapAuthenticationProvid this.setAuthoritiesPopulator(new NullLdapAuthoritiesPopulator()); } - // ~ Methods - // ======================================================================================================== - private void setAuthenticator(LdapAuthenticator authenticator) { Assert.notNull(authenticator, "An LdapAuthenticator must be supplied"); this.authenticator = authenticator; diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java index 2bbfd295e8..e1d2d9b391 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java @@ -31,9 +31,6 @@ import org.springframework.ldap.core.DirContextOperations; */ public interface LdapAuthenticator { - // ~ Methods - // ======================================================================================================== - /** * Authenticates as a user and obtains additional user information from the directory. * @param authentication diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java index 1b9e765a86..147d1b9ab3 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java @@ -48,30 +48,18 @@ import org.springframework.util.Assert; */ public final class PasswordComparisonAuthenticator extends AbstractLdapAuthenticator { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(PasswordComparisonAuthenticator.class); - // ~ Instance fields - // ================================================================================================ - private PasswordEncoder passwordEncoder = new LdapShaPasswordEncoder(KeyGenerators.shared(0)); private String passwordAttributeName = "userPassword"; private boolean usePasswordAttrCompare = false; - // ~ Constructors - // =================================================================================================== - public PasswordComparisonAuthenticator(BaseLdapPathContextSource contextSource) { super(contextSource); } - // ~ Methods - // ======================================================================================================== - public DirContextOperations authenticate(final Authentication authentication) { Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication, "Can only process UsernamePasswordAuthenticationToken objects"); diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java index 4e070a0337..a905c68c7b 100755 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java @@ -32,20 +32,11 @@ import javax.naming.ldap.Control; */ public class PasswordPolicyControl implements Control { - // ~ Static fields/initializers - // ===================================================================================== - /** OID of the Password Policy Control */ public static final String OID = "1.3.6.1.4.1.42.2.27.8.5.1"; - // ~ Instance fields - // ================================================================================================ - private final boolean critical; - // ~ Constructors - // =================================================================================================== - /** * Creates a non-critical (request) control. */ @@ -61,9 +52,6 @@ public class PasswordPolicyControl implements Control { this.critical = critical; } - // ~ Methods - // ======================================================================================================== - /** * Retrieves the ASN.1 BER encoded value of the LDAP control. The request value for * this control is always empty. diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java index ea8d3927e9..dba0b67d83 100755 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java @@ -27,9 +27,6 @@ import javax.naming.ldap.ControlFactory; */ public class PasswordPolicyControlFactory extends ControlFactory { - // ~ Methods - // ======================================================================================================== - /** * Creates an instance of PasswordPolicyResponseControl if the passed control is a * response control of this type. Attributes of the result are filled with the correct diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java index 103df7161d..6c43c1921b 100755 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java @@ -50,14 +50,8 @@ import org.springframework.dao.DataRetrievalFailureException; */ public class PasswordPolicyResponseControl extends PasswordPolicyControl { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(PasswordPolicyResponseControl.class); - // ~ Instance fields - // ================================================================================================ - private final byte[] encodedValue; private PasswordPolicyErrorStatus errorStatus; @@ -66,9 +60,6 @@ public class PasswordPolicyResponseControl extends PasswordPolicyControl { private int timeBeforeExpiration = Integer.MAX_VALUE; - // ~ Constructors - // =================================================================================================== - /** * Decodes the Ber encoded control data. The ASN.1 value of the control data is: * @@ -98,9 +89,6 @@ public class PasswordPolicyResponseControl extends PasswordPolicyControl { } } - // ~ Methods - // ======================================================================================================== - /** * Returns the unchanged value of the response control. Returns the unchanged value of * the response control as byte array. @@ -194,18 +182,12 @@ public class PasswordPolicyResponseControl extends PasswordPolicyControl { return sb.toString(); } - // ~ Inner Interfaces - // =============================================================================================== - private interface PPolicyDecoder { void decode() throws IOException; } - // ~ Inner Classes - // ================================================================================================== - /** * Decoder based on Netscape ldapsdk library */ diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java index dcb8de53ce..f10bd4d8f0 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java +++ b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java @@ -41,14 +41,8 @@ import javax.naming.directory.SearchControls; */ public class FilterBasedLdapUserSearch implements LdapUserSearch { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(FilterBasedLdapUserSearch.class); - // ~ Instance fields - // ================================================================================================ - private final ContextSource contextSource; /** @@ -78,9 +72,6 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { */ private final String searchFilter; - // ~ Constructors - // =================================================================================================== - public FilterBasedLdapUserSearch(String searchBase, String searchFilter, BaseLdapPathContextSource contextSource) { Assert.notNull(contextSource, "contextSource must not be null"); Assert.notNull(searchFilter, "searchFilter must not be null."); @@ -98,9 +89,6 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { } } - // ~ Methods - // ======================================================================================================== - /** * Return the LdapUserDetails containing the user's information * @param username the username to search for. diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java index 73524f679f..3852cc62b2 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java +++ b/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java @@ -29,9 +29,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; */ public interface LdapUserSearch { - // ~ Methods - // ======================================================================================================== - /** * Locates a single user in the directory and returns the LDAP information for that * user. diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java index b0856d8d19..0820351a28 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java @@ -100,14 +100,8 @@ import org.springframework.util.Assert; */ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(DefaultLdapAuthoritiesPopulator.class); - // ~ Instance fields - // ================================================================================================ - /** * A default role which will be assigned to all authenticated users if set */ @@ -154,9 +148,6 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator */ private Function>, GrantedAuthority> authorityMapper; - // ~ Constructors - // =================================================================================================== - /** * Constructor for group search scenarios. userRoleAttributes may still be * set as a property. @@ -188,9 +179,6 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator }; } - // ~ Methods - // ======================================================================================================== - /** * This method should be overridden if required to obtain any additional roles for the * given user (on top of those obtained from the standard search implemented by this diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java index fc2562c4b5..aad3425419 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java @@ -33,9 +33,6 @@ import org.springframework.ldap.core.DirContextOperations; */ public interface LdapAuthoritiesPopulator { - // ~ Methods - // ======================================================================================================== - /** * Get the list of authorities for the user. * @param userData the context object which was returned by the LDAP authenticator. diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java index f3963adc6a..71c7954baa 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java @@ -26,9 +26,6 @@ import org.springframework.security.core.userdetails.UserDetails; */ public interface LdapUserDetails extends UserDetails, CredentialsContainer { - // ~ Methods - // ======================================================================================================== - /** * The DN of the entry for this user's account. * @return the user's DN diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java index 543e769013..812f637d87 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java @@ -51,9 +51,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private String dn; private String password; @@ -75,15 +72,9 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData private int graceLoginsRemaining = Integer.MAX_VALUE; - // ~ Constructors - // =================================================================================================== - protected LdapUserDetailsImpl() { } - // ~ Methods - // ======================================================================================================== - @Override public Collection getAuthorities() { return authorities; @@ -186,9 +177,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData return sb.toString(); } - // ~ Inner Classes - // ================================================================================================== - /** * Variation of essence pattern. Used to create mutable intermediate object */ diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java index 970717bd58..ba974652da 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java @@ -39,9 +39,6 @@ import org.springframework.util.Assert; */ public class LdapUserDetailsMapper implements UserDetailsContextMapper { - // ~ Instance fields - // ================================================================================================ - private final Log logger = LogFactory.getLog(LdapUserDetailsMapper.class); private String passwordAttributeName = "userPassword"; @@ -52,9 +49,6 @@ public class LdapUserDetailsMapper implements UserDetailsContextMapper { private boolean convertToUpperCase = true; - // ~ Methods - // ======================================================================================================== - @Override public UserDetails mapUserFromContext(DirContextOperations ctx, String username, Collection authorities) { diff --git a/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java b/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java index 3f260f4b7f..e6ae41692e 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java @@ -31,9 +31,6 @@ import org.junit.Test; */ public class LdapUtilsTests { - // ~ Methods - // ======================================================================================================== - @Test public void testCloseContextSwallowsNamingException() throws Exception { final DirContext dirCtx = mock(DirContext.class); diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java index 0e367024c4..dac158ac86 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java @@ -46,9 +46,6 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper; */ public class LdapAuthenticationProviderTests { - // ~ Methods - // ======================================================================================================== - @Test public void testSupportsUsernamePasswordAuthenticationToken() { LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator(), @@ -177,9 +174,6 @@ public class LdapAuthenticationProviderTests { } } - // ~ Inner Classes - // ================================================================================================== - class MockAuthenticator implements LdapAuthenticator { public DirContextOperations authenticate(Authentication authentication) { diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java index d22d6f2244..ee772012f5 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java @@ -25,14 +25,8 @@ import org.springframework.ldap.core.DirContextOperations; */ public class MockUserSearch implements LdapUserSearch { - // ~ Instance fields - // ================================================================================================ - DirContextOperations user; - // ~ Constructors - // =================================================================================================== - public MockUserSearch() { } @@ -40,9 +34,6 @@ public class MockUserSearch implements LdapUserSearch { this.user = user; } - // ~ Methods - // ======================================================================================================== - public DirContextOperations searchForUser(String username) { return user; } diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java index c7e92fa5b3..f292edaf7a 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java @@ -33,9 +33,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio */ public class PasswordComparisonAuthenticatorMockTests { - // ~ Methods - // ======================================================================================================== - @Test public void ldapCompareOperationIsUsedWhenPasswordIsNotRetrieved() throws Exception { final DirContext dirCtx = mock(DirContext.class); diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java index d76ea93e19..9844581a5c 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java @@ -27,9 +27,6 @@ import org.junit.Test; */ public class PasswordPolicyResponseControlTests { - // ~ Methods - // ======================================================================================================== - /** * Useful method for obtaining data from a server for use in tests */ diff --git a/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java index acfe840916..fa623b7d7e 100644 --- a/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java +++ b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java @@ -28,9 +28,6 @@ import org.springframework.security.core.AuthenticationException; */ public class AuthenticationCancelledException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - public AuthenticationCancelledException(String msg) { super(msg); } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java index ad110c9342..65d6926568 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java @@ -55,18 +55,12 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { private static final String ATTRIBUTE_LIST_KEY = "SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST"; - // ~ Instance fields - // ================================================================================================ - protected final Log logger = LogFactory.getLog(getClass()); private final ConsumerManager consumerManager; private final AxFetchListFactory attributesToFetchFactory; - // ~ Constructors - // =================================================================================================== - public OpenID4JavaConsumer() throws ConsumerException { this(new ConsumerManager(), new NullAxFetchListFactory()); } @@ -80,9 +74,6 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { this.attributesToFetchFactory = attributesToFetchFactory; } - // ~ Methods - // ======================================================================================================== - public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl, String realm) throws OpenIDConsumerException { List discoveries; diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java index 6c76689397..cd75656ffb 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java @@ -71,14 +71,8 @@ import java.util.*; */ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessingFilter { - // ~ Static fields/initializers - // ===================================================================================== - public static final String DEFAULT_CLAIMED_IDENTITY_FIELD = "openid_identifier"; - // ~ Instance fields - // ================================================================================================ - private OpenIDConsumer consumer; private String claimedIdentityFieldName = DEFAULT_CLAIMED_IDENTITY_FIELD; @@ -87,16 +81,10 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing private Set returnToUrlParameters = Collections.emptySet(); - // ~ Constructors - // =================================================================================================== - public OpenIDAuthenticationFilter() { super("/login/openid"); } - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { super.afterPropertiesSet(); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java index 7a94db22a2..cbc20858de 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java @@ -53,16 +53,10 @@ import org.springframework.util.Assert; */ public class OpenIDAuthenticationProvider implements AuthenticationProvider, InitializingBean { - // ~ Instance fields - // ================================================================================================ - private AuthenticationUserDetailsService userDetailsService; private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper(); - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notNull(this.userDetailsService, "The userDetailsService must be set"); } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java index 16586b7b10..1f038cb090 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java @@ -47,9 +47,6 @@ public enum OpenIDAuthenticationStatus { private final String name; - // ~ Constructors - // =================================================================================================== - OpenIDAuthenticationStatus(String name) { this.name = name; } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java index 659cbf53a5..60e0f52637 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java @@ -36,9 +36,6 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private final OpenIDAuthenticationStatus status; private final Object principal; @@ -49,9 +46,6 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { private final List attributes; - // ~ Constructors - // =================================================================================================== - public OpenIDAuthenticationToken(OpenIDAuthenticationStatus status, String identityUrl, String message, List attributes) { super(new ArrayList<>(0)); @@ -81,9 +75,6 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { setAuthenticated(true); } - // ~ Methods - // ======================================================================================================== - /** * Returns 'null' always, as no credentials are processed by the OpenID provider. * @see org.springframework.security.core.Authentication#getCredentials() diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java index 9092f6ad5e..937a35091d 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java @@ -26,9 +26,6 @@ package org.springframework.security.openid; */ public class OpenIDConsumerException extends Exception { - // ~ Constructors - // =================================================================================================== - public OpenIDConsumerException(String message) { super(message); } diff --git a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java index cb4f7576d4..67dbcc9b5a 100644 --- a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java +++ b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java @@ -26,9 +26,6 @@ import javax.servlet.http.HttpServletRequest; */ public class MockOpenIDConsumer implements OpenIDConsumer { - // ~ Instance fields - // ================================================================================================ - private OpenIDAuthenticationToken token; private String redirectUrl; @@ -49,9 +46,6 @@ public class MockOpenIDConsumer implements OpenIDConsumer { this.token = token; } - // ~ Methods - // ======================================================================================================== - public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm) { return redirectUrl; } diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java index 2ba7d99a50..aef409a22c 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java @@ -43,14 +43,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; */ public class OpenIDAuthenticationProviderTests { - // ~ Static fields/initializers - // ===================================================================================== - private static final String USERNAME = "user.acegiopenid.com"; - // ~ Methods - // ======================================================================================================== - /* * Test method for * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider. diff --git a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java index d706fa0dad..13cd7bc8ee 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java +++ b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java @@ -36,19 +36,10 @@ import org.springframework.security.core.context.SecurityContextHolder; */ public class AuthenticationSimpleHttpInvokerRequestExecutor extends SimpleHttpInvokerRequestExecutor { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(AuthenticationSimpleHttpInvokerRequestExecutor.class); - // ~ Instance fields - // ================================================================================================ - private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); - // ~ Methods - // ======================================================================================================== - /** * Provided so subclasses can perform additional configuration if required (eg set * additional request headers for non-security related information etc). diff --git a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java index a2d125af3a..475da26fcc 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java +++ b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java @@ -48,16 +48,10 @@ public class ContextPropagatingRemoteInvocation extends RemoteInvocation { private static final Log logger = LogFactory.getLog(ContextPropagatingRemoteInvocation.class); - // ~ Instance fields - // ================================================================================================ - private final String principal; private final String credentials; - // ~ Constructors - // =================================================================================================== - /** * Constructs the object, storing the principal and credentials extracted from the * client-side security context. @@ -84,9 +78,6 @@ public class ContextPropagatingRemoteInvocation extends RemoteInvocation { } } - // ~ Methods - // ======================================================================================================== - /** * Invoked on the server-side. *

diff --git a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java index e01895feda..8436e8efa5 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java +++ b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java @@ -35,9 +35,6 @@ import org.springframework.remoting.support.RemoteInvocationFactory; */ public class ContextPropagatingRemoteInvocationFactory implements RemoteInvocationFactory { - // ~ Methods - // ======================================================================================================== - public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) { return new ContextPropagatingRemoteInvocation(methodInvocation); } diff --git a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java index 093f43bac4..c266330ded 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java @@ -39,8 +39,6 @@ import org.springframework.security.core.context.SecurityContextHolder; */ public class AuthenticationSimpleHttpInvokerRequestExecutorTests { - // ~ Methods - // ======================================================================================================== @After public void tearDown() { SecurityContextHolder.clearContext(); @@ -95,9 +93,6 @@ public class AuthenticationSimpleHttpInvokerRequestExecutorTests { assertThat(conn.getRequestProperty("Authorization")).isNull(); } - // ~ Inner Classes - // ================================================================================================== - private class MockHttpURLConnection extends HttpURLConnection { private Map requestProperties = new HashMap<>(); diff --git a/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java b/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java index 580ef9f5fa..2f9779ca55 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java @@ -39,8 +39,6 @@ import org.springframework.test.util.ReflectionTestUtils; */ public class ContextPropagatingRemoteInvocationTests { - // ~ Methods - // ======================================================================================================== @After public void tearDown() { SecurityContextHolder.clearContext(); diff --git a/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java index 31439eac66..cfed19b9fe 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java +++ b/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java @@ -23,15 +23,12 @@ import org.springframework.security.acls.domain.BasePermission; * @author Ben Alex */ public class AddPermission { - // ~ Instance fields - // ================================================================================================ + public Contact contact; public Integer permission = BasePermission.READ.getMask(); public String recipient; - // ~ Methods - // ======================================================================================================== public Contact getContact() { return contact; diff --git a/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java index 5c4b51f2b2..25c01eac83 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java +++ b/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java @@ -27,8 +27,7 @@ import org.springframework.validation.Validator; * @author Ben Alex */ public class AddPermissionValidator implements Validator { - // ~ Methods - // ======================================================================================================== + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { diff --git a/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java b/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java index c93a5d6c68..1203b77e1a 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java @@ -36,20 +36,15 @@ import org.springframework.util.StopWatch; * @author Ben Alex */ public class ClientApplication { - // ~ Instance fields - // ================================================================================================ + private final ListableBeanFactory beanFactory; - // ~ Constructors - // =================================================================================================== public ClientApplication(ListableBeanFactory beanFactory) { this.beanFactory = beanFactory; } - // ~ Methods - // ======================================================================================================== public void invokeContactManager(Authentication authentication, int nrOfCalls) { StopWatch stopWatch = new StopWatch(nrOfCalls + " ContactManager call(s)"); diff --git a/samples/xml/contacts/src/main/java/sample/contact/Contact.java b/samples/xml/contacts/src/main/java/sample/contact/Contact.java index b7819ce405..ec719e856b 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/Contact.java +++ b/samples/xml/contacts/src/main/java/sample/contact/Contact.java @@ -24,15 +24,12 @@ import java.io.Serializable; * @author Ben Alex */ public class Contact implements Serializable { - // ~ Instance fields - // ================================================================================================ + private Long id; private String email; private String name; - // ~ Constructors - // =================================================================================================== public Contact(String name, String email) { this.name = name; @@ -42,8 +39,6 @@ public class Contact implements Serializable { public Contact() { } - // ~ Methods - // ======================================================================================================== /** * @return Returns the email. diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java index c882e2856b..9f245582d2 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java @@ -24,8 +24,7 @@ import java.util.List; * @author Ben Alex */ public interface ContactDao { - // ~ Methods - // ======================================================================================================== + void create(Contact contact); diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java index 36619dd260..175c4c2f4e 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java @@ -30,8 +30,6 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport; */ public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao { - // ~ Methods - // ======================================================================================================== public void create(final Contact contact) { getJdbcTemplate().update("insert into contacts values (?, ?, ?)", diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java index 924df446d2..13f3f8b4e2 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java @@ -28,8 +28,7 @@ import java.util.List; * @author Ben Alex */ public interface ContactManager { - // ~ Methods - // ======================================================================================================== + @PreAuthorize("hasPermission(#contact, admin)") void addPermission(Contact contact, Sid recipient, Permission permission); diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java index ea7eabba7b..b33d5fbcf5 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java @@ -49,15 +49,12 @@ import java.util.Random; @Transactional public class ContactManagerBackend extends ApplicationObjectSupport implements ContactManager, InitializingBean { - // ~ Instance fields - // ================================================================================================ + private ContactDao contactDao; private MutableAclService mutableAclService; private int counter = 1000; - // ~ Methods - // ======================================================================================================== public void afterPropertiesSet() { Assert.notNull(contactDao, "contactDao required"); diff --git a/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java b/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java index c58b1fd76c..aa2358cda1 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java +++ b/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java @@ -43,8 +43,7 @@ import org.springframework.util.Assert; * @author Ben Alex */ public class DataSourcePopulator implements InitializingBean { - // ~ Instance fields - // ================================================================================================ + JdbcTemplate template; private MutableAclService mutableAclService; @@ -60,8 +59,6 @@ public class DataSourcePopulator implements InitializingBean { "Parklin", "Findlay", "Robinson", "Giugni", "Lang", "Chi", "Carmichael" }; private int createEntities = 50; - // ~ Methods - // ======================================================================================================== public void afterPropertiesSet() { Assert.notNull(mutableAclService, "mutableAclService required"); diff --git a/samples/xml/contacts/src/main/java/sample/contact/IndexController.java b/samples/xml/contacts/src/main/java/sample/contact/IndexController.java index 09c576862f..d5a578754a 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/IndexController.java +++ b/samples/xml/contacts/src/main/java/sample/contact/IndexController.java @@ -44,16 +44,12 @@ public class IndexController { BasePermission.DELETE, BasePermission.ADMINISTRATION }; private final static Permission[] HAS_ADMIN = new Permission[] { BasePermission.ADMINISTRATION }; - // ~ Instance fields - // ================================================================================================ @Autowired private ContactManager contactManager; @Autowired private PermissionEvaluator permissionEvaluator; - // ~ Methods - // ======================================================================================================== /** * The public index page, used for unauthenticated users. diff --git a/samples/xml/contacts/src/main/java/sample/contact/WebContact.java b/samples/xml/contacts/src/main/java/sample/contact/WebContact.java index df38b0c5f0..c4ae49df67 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/WebContact.java +++ b/samples/xml/contacts/src/main/java/sample/contact/WebContact.java @@ -22,14 +22,11 @@ package sample.contact; * @author Ben Alex */ public class WebContact { - // ~ Instance fields - // ================================================================================================ + private String email; private String name; - // ~ Methods - // ======================================================================================================== public String getEmail() { return email; diff --git a/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java b/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java index f4f27d4306..8d0b754489 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java +++ b/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java @@ -25,8 +25,7 @@ import org.springframework.validation.Validator; * @author Ben Alex */ public class WebContactValidator implements Validator { - // ~ Methods - // ======================================================================================================== + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { diff --git a/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java b/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java index 9a9b8ec023..498cb8a63c 100644 --- a/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java +++ b/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java @@ -44,14 +44,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; "/applicationContext-common-business.xml" }) @RunWith(SpringJUnit4ClassRunner.class) public class ContactManagerTests { - // ~ Instance fields - // ================================================================================================ + @Autowired protected ContactManager contactManager; - // ~ Methods - // ======================================================================================================== void assertContainsContact(long id, List contacts) { for (Contact contact : contacts) { diff --git a/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java b/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java index fe6fc7ba83..0186b32b17 100644 --- a/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java +++ b/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java @@ -34,15 +34,12 @@ import javax.security.auth.spi.LoginModule; * @author Rob Winch */ public class UsernameEqualsPasswordLoginModule implements LoginModule { - // ~ Instance fields - // ================================================================================================ + private String password; private String username; private Subject subject; - // ~ Methods - // ======================================================================================================== @Override public boolean abort() { diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java index b2b1d9ef6e..f9ffb91dae 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java @@ -53,14 +53,8 @@ import org.springframework.security.web.context.support.SecurityWebApplicationCo */ public class AccessControlListTag extends TagSupport { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(AccessControlListTag.class); - // ~ Instance fields - // ================================================================================================ - private ApplicationContext applicationContext; private Object domainObject; @@ -71,9 +65,6 @@ public class AccessControlListTag extends TagSupport { private String var; - // ~ Methods - // ======================================================================================================== - public int doStartTag() throws JspException { if ((null == hasPermission) || "".equals(hasPermission)) { return skipBody(); diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java index 90d7200f65..cb55b89aa2 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java @@ -43,9 +43,6 @@ import javax.servlet.jsp.tagext.TagSupport; */ public class AuthenticationTag extends TagSupport { - // ~ Instance fields - // ================================================================================================ - private String var; private String property; @@ -56,9 +53,6 @@ public class AuthenticationTag extends TagSupport { private boolean htmlEscape = true; - // ~ Methods - // ======================================================================================================== - public AuthenticationTag() { init(); } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java index edadacd968..f4582fdcde 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java @@ -36,18 +36,12 @@ import org.springframework.security.core.userdetails.User; */ public class AuthenticationTagTests { - // ~ Instance fields - // ================================================================================================ - private final MyAuthenticationTag authenticationTag = new MyAuthenticationTag(); private final Authentication auth = new TestingAuthenticationToken( new User("rodUserDetails", "koala", true, true, true, true, AuthorityUtils.NO_AUTHORITIES), "koala", AuthorityUtils.NO_AUTHORITIES); - // ~ Methods - // ======================================================================================================== - @After public void tearDown() { SecurityContextHolder.clearContext(); @@ -144,9 +138,6 @@ public class AuthenticationTagTests { assertThat(authenticationTag.getLastMessage()).isEqualTo("<>& "); } - // ~ Inner Classes - // ================================================================================================== - private class MyAuthenticationTag extends AuthenticationTag { String lastMessage = null; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java index a5c8fdb5db..f9cd559ffc 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java @@ -49,9 +49,6 @@ import org.springframework.web.context.support.StaticWebApplicationContext; @RunWith(MockitoJUnitRunner.class) public class AuthorizeTagTests { - // ~ Instance fields - // ================================================================================================ - @Mock private PermissionEvaluator permissionEvaluator; @@ -62,9 +59,6 @@ public class AuthorizeTagTests { private final TestingAuthenticationToken currentUser = new TestingAuthenticationToken("abc", "123", "ROLE SUPERVISOR", "ROLE_TELLER"); - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { SecurityContextHolder.getContext().setAuthentication(currentUser); diff --git a/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java index fe20e437ea..b21dd85078 100644 --- a/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java @@ -32,9 +32,6 @@ import javax.servlet.http.HttpServletResponse; */ public interface AuthenticationEntryPoint { - // ~ Methods - // ======================================================================================================== - /** * Commences an authentication scheme. *

diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java index 05de25a48f..e67db58754 100644 --- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java +++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java @@ -137,14 +137,8 @@ import java.util.*; */ public class FilterChainProxy extends GenericFilterBean { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(FilterChainProxy.class); - // ~ Instance fields - // ================================================================================================ - private final static String FILTER_APPLIED = FilterChainProxy.class.getName().concat(".APPLIED"); private List filterChains; @@ -155,9 +149,6 @@ public class FilterChainProxy extends GenericFilterBean { private RequestRejectedHandler requestRejectedHandler = new DefaultRequestRejectedHandler(); - // ~ Methods - // ======================================================================================================== - public FilterChainProxy() { } @@ -296,9 +287,6 @@ public class FilterChainProxy extends GenericFilterBean { return sb.toString(); } - // ~ Inner Classes - // ================================================================================================== - /** * Internal {@code FilterChain} implementation that is used to pass a request through * the additional internal list of filters which match the request. diff --git a/web/src/main/java/org/springframework/security/web/FilterInvocation.java b/web/src/main/java/org/springframework/security/web/FilterInvocation.java index 1441bcf446..3245cf0b69 100644 --- a/web/src/main/java/org/springframework/security/web/FilterInvocation.java +++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java @@ -54,24 +54,16 @@ import org.springframework.security.web.util.UrlUtils; */ public class FilterInvocation { - // ~ Static fields - // ================================================================================================== static final FilterChain DUMMY_CHAIN = (req, res) -> { throw new UnsupportedOperationException("Dummy filter chain"); }; - // ~ Instance fields - // ================================================================================================ - private FilterChain chain; private HttpServletRequest request; private HttpServletResponse response; - // ~ Constructors - // =================================================================================================== - public FilterInvocation(ServletRequest request, ServletResponse response, FilterChain chain) { if ((request == null) || (response == null) || (chain == null)) { throw new IllegalArgumentException("Cannot pass null values to constructor"); @@ -104,9 +96,6 @@ public class FilterInvocation { this.request = request; } - // ~ Methods - // ======================================================================================================== - public FilterChain getChain() { return this.chain; } diff --git a/web/src/main/java/org/springframework/security/web/PortMapper.java b/web/src/main/java/org/springframework/security/web/PortMapper.java index 94388052de..eafe8597c6 100644 --- a/web/src/main/java/org/springframework/security/web/PortMapper.java +++ b/web/src/main/java/org/springframework/security/web/PortMapper.java @@ -24,9 +24,6 @@ package org.springframework.security.web; */ public interface PortMapper { - // ~ Methods - // ======================================================================================================== - /** * Locates the HTTP port associated with the specified HTTPS port. *

diff --git a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java index 3789cad848..bf734731b3 100644 --- a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java @@ -33,23 +33,14 @@ import org.springframework.util.Assert; */ public class PortMapperImpl implements PortMapper { - // ~ Instance fields - // ================================================================================================ - private final Map httpsPortMappings; - // ~ Constructors - // =================================================================================================== - public PortMapperImpl() { this.httpsPortMappings = new HashMap<>(); this.httpsPortMappings.put(80, 443); this.httpsPortMappings.put(8080, 8443); } - // ~ Methods - // ======================================================================================================== - /** * Returns the translated (Integer -> Integer) version of the original port mapping * specified via setHttpsPortMapping() diff --git a/web/src/main/java/org/springframework/security/web/PortResolver.java b/web/src/main/java/org/springframework/security/web/PortResolver.java index fcb8432b97..b83cfc976c 100644 --- a/web/src/main/java/org/springframework/security/web/PortResolver.java +++ b/web/src/main/java/org/springframework/security/web/PortResolver.java @@ -31,9 +31,6 @@ import javax.servlet.ServletRequest; */ public interface PortResolver { - // ~ Methods - // ======================================================================================================== - /** * Indicates the port the ServletRequest was received on. * @param request that the method should lookup the port for diff --git a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java index 1c297ca15b..ba89b6fba0 100644 --- a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java @@ -36,14 +36,8 @@ import javax.servlet.ServletRequest; */ public class PortResolverImpl implements PortResolver { - // ~ Instance fields - // ================================================================================================ - private PortMapper portMapper = new PortMapperImpl(); - // ~ Methods - // ======================================================================================================== - public PortMapper getPortMapper() { return portMapper; } diff --git a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java index 323b0f2bb5..28b73013c2 100644 --- a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java @@ -32,9 +32,6 @@ import javax.servlet.http.HttpServletResponse; */ public interface AccessDeniedHandler { - // ~ Methods - // ======================================================================================================== - /** * Handles an access denied failure. * @param request that resulted in an AccessDeniedException diff --git a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java index 82f9cc7c59..5e9971bee1 100644 --- a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java +++ b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java @@ -44,19 +44,10 @@ import org.springframework.security.web.WebAttributes; */ public class AccessDeniedHandlerImpl implements AccessDeniedHandler { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(AccessDeniedHandlerImpl.class); - // ~ Instance fields - // ================================================================================================ - private String errorPage; - // ~ Methods - // ======================================================================================================== - public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { if (!response.isCommitted()) { diff --git a/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java index 6bbc035266..cc4372bfed 100644 --- a/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java +++ b/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java @@ -36,19 +36,10 @@ import org.springframework.util.Assert; */ public class DefaultWebInvocationPrivilegeEvaluator implements WebInvocationPrivilegeEvaluator { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(DefaultWebInvocationPrivilegeEvaluator.class); - // ~ Instance fields - // ================================================================================================ - private final AbstractSecurityInterceptor securityInterceptor; - // ~ Constructors - // =================================================================================================== - public DefaultWebInvocationPrivilegeEvaluator(AbstractSecurityInterceptor securityInterceptor) { Assert.notNull(securityInterceptor, "SecurityInterceptor cannot be null"); Assert.isTrue(FilterInvocation.class.equals(securityInterceptor.getSecureObjectClass()), @@ -59,9 +50,6 @@ public class DefaultWebInvocationPrivilegeEvaluator implements WebInvocationPriv this.securityInterceptor = securityInterceptor; } - // ~ Methods - // ======================================================================================================== - /** * Determines whether the user represented by the supplied Authentication * object is allowed to invoke the supplied URI. diff --git a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java index 91fc60bedc..01720b26ff 100644 --- a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java +++ b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java @@ -77,9 +77,6 @@ import java.io.IOException; */ public class ExceptionTranslationFilter extends GenericFilterBean { - // ~ Instance fields - // ================================================================================================ - private AccessDeniedHandler accessDeniedHandler = new AccessDeniedHandlerImpl(); private AuthenticationEntryPoint authenticationEntryPoint; @@ -103,9 +100,6 @@ public class ExceptionTranslationFilter extends GenericFilterBean { this.requestCache = requestCache; } - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(authenticationEntryPoint, "authenticationEntryPoint must be specified"); diff --git a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java index 527b523969..59b91251ba 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java @@ -30,13 +30,8 @@ import java.io.IOException; */ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint { - // ~ Static fields/initializers - // ===================================================================================== protected final Log logger = LogFactory.getLog(getClass()); - // ~ Instance fields - // ================================================================================================ - private PortMapper portMapper = new PortMapperImpl(); private PortResolver portResolver = new PortResolverImpl(); @@ -49,17 +44,11 @@ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint { private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); - // ~ Constructors - // =================================================================================================== - public AbstractRetryEntryPoint(String scheme, int standardPort) { this.scheme = scheme; this.standardPort = standardPort; } - // ~ Methods - // ======================================================================================================== - public void commence(HttpServletRequest request, HttpServletResponse response) throws IOException { String queryString = request.getQueryString(); String redirectUrl = request.getRequestURI() + ((queryString == null) ? "" : ("?" + queryString)); diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java index b9488a1245..24780a9817 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java @@ -31,9 +31,6 @@ import javax.servlet.ServletException; */ public interface ChannelDecisionManager { - // ~ Methods - // ======================================================================================================== - /** * Decided whether the presented {@link FilterInvocation} provides the appropriate * level of channel security based on the requested list of ConfigAttributes. diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java index 8df5074ad1..64d1144cfb 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java @@ -51,14 +51,8 @@ public class ChannelDecisionManagerImpl implements ChannelDecisionManager, Initi public static final String ANY_CHANNEL = "ANY_CHANNEL"; - // ~ Instance fields - // ================================================================================================ - private List channelProcessors; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.notEmpty(channelProcessors, "A list of ChannelProcessors is required"); } diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java index 334948eaed..485411327a 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java @@ -33,9 +33,6 @@ import javax.servlet.http.HttpServletResponse; */ public interface ChannelEntryPoint { - // ~ Methods - // ======================================================================================================== - /** * Commences a secure channel. *

diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java index c47aae6930..ad902951f3 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java @@ -85,16 +85,10 @@ import org.springframework.web.filter.GenericFilterBean; */ public class ChannelProcessingFilter extends GenericFilterBean { - // ~ Instance fields - // ================================================================================================ - private ChannelDecisionManager channelDecisionManager; private FilterInvocationSecurityMetadataSource securityMetadataSource; - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(this.securityMetadataSource, "securityMetadataSource must be specified"); diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java index 915699442d..838b6a4591 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java @@ -37,9 +37,6 @@ import javax.servlet.ServletException; */ public interface ChannelProcessor { - // ~ Methods - // ======================================================================================================== - /** * Decided whether the presented {@link FilterInvocation} provides the appropriate * level of channel security based on the requested list of ConfigAttributes. diff --git a/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java index 8ccb57c29b..7703a96e09 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java @@ -42,16 +42,10 @@ import org.springframework.util.Assert; */ public class InsecureChannelProcessor implements InitializingBean, ChannelProcessor { - // ~ Instance fields - // ================================================================================================ - private ChannelEntryPoint entryPoint = new RetryWithHttpEntryPoint(); private String insecureKeyword = "REQUIRES_INSECURE_CHANNEL"; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.hasLength(insecureKeyword, "insecureKeyword required"); Assert.notNull(entryPoint, "entryPoint required"); diff --git a/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java index 0b32d736d3..8c95c8fee2 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java @@ -42,16 +42,10 @@ import org.springframework.util.Assert; */ public class SecureChannelProcessor implements InitializingBean, ChannelProcessor { - // ~ Instance fields - // ================================================================================================ - private ChannelEntryPoint entryPoint = new RetryWithHttpsEntryPoint(); private String secureKeyword = "REQUIRES_SECURE_CHANNEL"; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.hasLength(secureKeyword, "secureKeyword required"); Assert.notNull(entryPoint, "entryPoint required"); diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java index 034712fb59..f7312bf654 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java @@ -56,9 +56,6 @@ public class DefaultFilterInvocationSecurityMetadataSource implements FilterInvo private final Map> requestMap; - // ~ Constructors - // =================================================================================================== - /** * Sets the internal request map from the supplied map. The key elements should be of * type {@link RequestMatcher}, which. The path stored in the key will depend on the @@ -71,9 +68,6 @@ public class DefaultFilterInvocationSecurityMetadataSource implements FilterInvo this.requestMap = requestMap; } - // ~ Methods - // ======================================================================================================== - public Collection getAllConfigAttributes() { Set allAttributes = new HashSet<>(); diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java b/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java index 158b4daef2..1ca4f387b1 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java @@ -44,21 +44,12 @@ import org.springframework.security.web.FilterInvocation; */ public class FilterSecurityInterceptor extends AbstractSecurityInterceptor implements Filter { - // ~ Static fields/initializers - // ===================================================================================== - private static final String FILTER_APPLIED = "__spring_security_filterSecurityInterceptor_filterApplied"; - // ~ Instance fields - // ================================================================================================ - private FilterInvocationSecurityMetadataSource securityMetadataSource; private boolean observeOncePerRequest = true; - // ~ Methods - // ======================================================================================================== - /** * Not used (we rely on IoC container lifecycle services instead) * @param arg0 ignored diff --git a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java index 53260f68c0..0d98bffd54 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java @@ -110,12 +110,6 @@ import org.springframework.web.filter.GenericFilterBean; public abstract class AbstractAuthenticationProcessingFilter extends GenericFilterBean implements ApplicationEventPublisherAware, MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - - // ~ Instance fields - // ================================================================================================ - protected ApplicationEventPublisher eventPublisher; protected AuthenticationDetailsSource authenticationDetailsSource = new WebAuthenticationDetailsSource(); @@ -138,9 +132,6 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler(); - // ~ Constructors - // =================================================================================================== - /** * @param defaultFilterProcessesUrl the default value for filterProcessesUrl. */ @@ -185,9 +176,6 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt setAuthenticationManager(authenticationManager); } - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(authenticationManager, "authenticationManager must be specified"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java index 788be0568f..86179f12a3 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java @@ -44,9 +44,6 @@ import org.springframework.web.filter.GenericFilterBean; */ public class AnonymousAuthenticationFilter extends GenericFilterBean implements InitializingBean { - // ~ Instance fields - // ================================================================================================ - private AuthenticationDetailsSource authenticationDetailsSource = new WebAuthenticationDetailsSource(); private String key; @@ -78,9 +75,6 @@ public class AnonymousAuthenticationFilter extends GenericFilterBean implements this.authorities = authorities; } - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.hasLength(key, "key must have length"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java index 79244ab283..d1f18f9403 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java @@ -64,14 +64,8 @@ import org.springframework.util.StringUtils; */ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(LoginUrlAuthenticationEntryPoint.class); - // ~ Instance fields - // ================================================================================================ - private PortMapper portMapper = new PortMapperImpl(); private PortResolver portResolver = new PortResolverImpl(); @@ -94,9 +88,6 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin this.loginFormUrl = loginFormUrl; } - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.isTrue(StringUtils.hasText(loginFormUrl) && UrlUtils.isValidRedirectUrl(loginFormUrl), "loginFormUrl must be specified and must be a valid redirect URL"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java index 8dc1fecaf2..fdf2b9a0ca 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java @@ -31,9 +31,6 @@ import javax.servlet.http.HttpServletResponse; */ public class NullRememberMeServices implements RememberMeServices { - // ~ Methods - // ======================================================================================================== - public Authentication autoLogin(HttpServletRequest request, HttpServletResponse response) { return null; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java index 8bd8d56c70..a90c829db5 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java @@ -48,9 +48,6 @@ import org.springframework.security.core.Authentication; */ public interface RememberMeServices { - // ~ Methods - // ======================================================================================================== - /** * This method will be called whenever the SecurityContextHolder does not * contain an Authentication object and Spring Security wishes to provide diff --git a/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java index 8669fa0044..7958999813 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java @@ -47,9 +47,6 @@ import javax.servlet.http.HttpServletResponse; */ public class UsernamePasswordAuthenticationFilter extends AbstractAuthenticationProcessingFilter { - // ~ Static fields/initializers - // ===================================================================================== - public static final String SPRING_SECURITY_FORM_USERNAME_KEY = "username"; public static final String SPRING_SECURITY_FORM_PASSWORD_KEY = "password"; @@ -63,9 +60,6 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication private boolean postOnly = true; - // ~ Constructors - // =================================================================================================== - public UsernamePasswordAuthenticationFilter() { super(DEFAULT_ANT_PATH_REQUEST_MATCHER); } @@ -74,9 +68,6 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication super(DEFAULT_ANT_PATH_REQUEST_MATCHER, authenticationManager); } - // ~ Methods - // ======================================================================================================== - public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException { if (postOnly && !request.getMethod().equals("POST")) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java index b099a8c745..53e0f204a6 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java @@ -32,16 +32,10 @@ public class WebAuthenticationDetails implements Serializable { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ - private final String remoteAddress; private final String sessionId; - // ~ Constructors - // =================================================================================================== - /** * Records the remote address and will also set the session Id if a session already * exists (it won't create one). @@ -64,9 +58,6 @@ public class WebAuthenticationDetails implements Serializable { this.sessionId = sessionId; } - // ~ Methods - // ======================================================================================================== - @Override public boolean equals(Object obj) { if (obj instanceof WebAuthenticationDetails) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java index 00b501efc8..8214d3d168 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java @@ -30,9 +30,6 @@ import javax.servlet.http.HttpServletRequest; public class WebAuthenticationDetailsSource implements AuthenticationDetailsSource { - // ~ Methods - // ======================================================================================================== - /** * @param context the {@code HttpServletRequest} object. * @return the {@code WebAuthenticationDetails} containing information about the diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java index c7376fc8dd..e26fadae9e 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java @@ -51,18 +51,12 @@ import org.springframework.web.filter.GenericFilterBean; */ public class LogoutFilter extends GenericFilterBean { - // ~ Instance fields - // ================================================================================================ - private RequestMatcher logoutRequestMatcher; private final LogoutHandler handler; private final LogoutSuccessHandler logoutSuccessHandler; - // ~ Constructors - // =================================================================================================== - /** * Constructor which takes a LogoutSuccessHandler instance to determine the * target destination after logging out. The list of LogoutHandlers are @@ -88,9 +82,6 @@ public class LogoutFilter extends GenericFilterBean { setFilterProcessesUrl("/logout"); } - // ~ Methods - // ======================================================================================================== - public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) req; diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java index e423ce4d8b..c8895803c6 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java @@ -31,9 +31,6 @@ import javax.servlet.http.HttpServletResponse; */ public interface LogoutHandler { - // ~ Methods - // ======================================================================================================== - /** * Causes a logout to be completed. The method must complete successfully. * @param request the HTTP request diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java index c6918afd75..1dd512eca9 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java @@ -48,9 +48,6 @@ public class SecurityContextLogoutHandler implements LogoutHandler { private boolean clearAuthentication = true; - // ~ Methods - // ======================================================================================================== - /** * Requires the request to be passed in. * @param request from which to obtain a HTTP session (cannot be null) diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java index dc60db89e9..11d1b3fe6c 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java @@ -43,8 +43,6 @@ import java.util.regex.Matcher; */ public class SubjectDnX509PrincipalExtractor implements X509PrincipalExtractor { - // ~ Instance fields - // ================================================================================================ protected final Log logger = LogFactory.getLog(getClass()); protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java index 2a3f7af0c3..6edc207e27 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java @@ -58,9 +58,6 @@ import org.springframework.util.StringUtils; */ public abstract class AbstractRememberMeServices implements RememberMeServices, InitializingBean, LogoutHandler { - // ~ Static fields/initializers - // ===================================================================================== - public static final String SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY = "remember-me"; public static final String DEFAULT_PARAMETER = "remember-me"; @@ -69,8 +66,6 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, private static final String DELIMITER = ":"; - // ~ Instance fields - // ================================================================================================ protected final Log logger = LogFactory.getLog(getClass()); protected final MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java index 496a36068e..6dd195c2cd 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java @@ -30,9 +30,6 @@ import java.util.*; */ public class JdbcTokenRepositoryImpl extends JdbcDaoSupport implements PersistentTokenRepository { - // ~ Static fields/initializers - // ===================================================================================== - /** Default SQL for creating the database table to store the tokens */ public static final String CREATE_TABLE_SQL = "create table persistent_logins (username varchar(64) not null, series varchar(64) primary key, " + "token varchar(64) not null, last_used timestamp not null)"; @@ -49,9 +46,6 @@ public class JdbcTokenRepositoryImpl extends JdbcDaoSupport implements Persisten /** The default SQL used by removeUserTokens */ public static final String DEF_REMOVE_USER_TOKENS_SQL = "delete from persistent_logins where username = ?"; - // ~ Instance fields - // ================================================================================================ - private String tokensBySeriesSql = DEF_TOKEN_BY_SERIES_SQL; private String insertTokenSql = DEF_INSERT_TOKEN_SQL; diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java index 8dd2fcf443..0aeb3298db 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java @@ -26,9 +26,6 @@ import org.springframework.security.core.AuthenticationException; */ public class RememberMeAuthenticationException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a {@code RememberMeAuthenticationException} with the specified message * and root cause. diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java index 5a8768875f..cd6ff9f875 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java @@ -63,9 +63,6 @@ import org.springframework.web.filter.GenericFilterBean; */ public class RememberMeAuthenticationFilter extends GenericFilterBean implements ApplicationEventPublisherAware { - // ~ Instance fields - // ================================================================================================ - private ApplicationEventPublisher eventPublisher; private AuthenticationSuccessHandler successHandler; @@ -82,9 +79,6 @@ public class RememberMeAuthenticationFilter extends GenericFilterBean implements this.rememberMeServices = rememberMeServices; } - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(authenticationManager, "authenticationManager must be specified"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java index de73ae99d5..71add1e380 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java @@ -87,9 +87,6 @@ public class TokenBasedRememberMeServices extends AbstractRememberMeServices { super(key, userDetailsService); } - // ~ Methods - // ======================================================================================================== - @Override protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java index 36f1389ae6..1b6c36deb3 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java @@ -29,16 +29,10 @@ import org.springframework.util.Assert; */ public class SessionFixationProtectionEvent extends AbstractAuthenticationEvent { - // ~ Instance fields - // ================================================================================================ - private final String oldSessionId; private final String newSessionId; - // ~ Constructors - // =================================================================================================== - /** * Constructs a new session fixation protection event. * @param authentication The authentication object @@ -53,9 +47,6 @@ public class SessionFixationProtectionEvent extends AbstractAuthenticationEvent this.newSessionId = newSessionId; } - // ~ Methods - // ======================================================================================================== - /** * Getter for the session ID before it was changed. * @return the old session ID. diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java index 88da2fae68..4f6d760a7b 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java @@ -27,14 +27,8 @@ import org.springframework.security.core.userdetails.UserDetails; */ public class AuthenticationSwitchUserEvent extends AbstractAuthenticationEvent { - // ~ Instance fields - // ================================================================================================ - private final UserDetails targetUser; - // ~ Constructors - // =================================================================================================== - /** * Switch user context event constructor * @param authentication The current Authentication object @@ -45,9 +39,6 @@ public class AuthenticationSwitchUserEvent extends AbstractAuthenticationEvent { this.targetUser = targetUser; } - // ~ Methods - // ======================================================================================================== - public UserDetails getTargetUser() { return targetUser; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java index cf9488cc55..b51ca06d61 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java @@ -108,16 +108,10 @@ import org.springframework.web.util.UrlPathHelper; */ public class SwitchUserFilter extends GenericFilterBean implements ApplicationEventPublisherAware, MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - public static final String SPRING_SECURITY_SWITCH_USERNAME_KEY = "username"; public static final String ROLE_PREVIOUS_ADMINISTRATOR = "ROLE_PREVIOUS_ADMINISTRATOR"; - // ~ Instance fields - // ================================================================================================ - private ApplicationEventPublisher eventPublisher; private AuthenticationDetailsSource authenticationDetailsSource = new WebAuthenticationDetailsSource(); @@ -146,9 +140,6 @@ public class SwitchUserFilter extends GenericFilterBean implements ApplicationEv private AuthenticationFailureHandler failureHandler; - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(this.userDetailsService, "userDetailsService must be specified"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java index 59e8f14238..90f262a262 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java @@ -35,15 +35,10 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - // ~ Instance fields - // ================================================================================================ private final String role; private final Authentication source; - // ~ Constructors - // =================================================================================================== - public SwitchUserGrantedAuthority(String role, Authentication source) { Assert.notNull(role, "role cannot be null"); Assert.notNull(source, "source cannot be null"); @@ -51,9 +46,6 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority { this.source = source; } - // ~ Methods - // ======================================================================================================== - /** * Returns the original user associated with a successful user switch. * @return The original Authentication object of the switched user. diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java index 5b66e00417..252d1cc3b5 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java @@ -42,14 +42,8 @@ import org.springframework.util.Assert; */ public class BasicAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean { - // ~ Instance fields - // ================================================================================================ - private String realmName; - // ~ Methods - // ======================================================================================================== - public void afterPropertiesSet() { Assert.hasText(realmName, "realmName must be specified"); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java index da0d342975..4d39673623 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java @@ -89,9 +89,6 @@ import org.springframework.web.filter.OncePerRequestFilter; */ public class BasicAuthenticationFilter extends OncePerRequestFilter { - // ~ Instance fields - // ================================================================================================ - private AuthenticationEntryPoint authenticationEntryPoint; private AuthenticationManager authenticationManager; @@ -132,9 +129,6 @@ public class BasicAuthenticationFilter extends OncePerRequestFilter { this.authenticationEntryPoint = authenticationEntryPoint; } - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(this.authenticationManager, "An AuthenticationManager is required"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java index 2bc777e21a..896c4c417a 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java @@ -46,14 +46,8 @@ import org.springframework.security.web.AuthenticationEntryPoint; */ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean, Ordered { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(DigestAuthenticationEntryPoint.class); - // ~ Instance fields - // ================================================================================================ - private String key; private String realmName; @@ -62,9 +56,6 @@ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, private int order = Integer.MAX_VALUE; // ~ default - // ~ Methods - // ======================================================================================================== - public int getOrder() { return order; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java index 6f6abb7faf..caeb12f489 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java @@ -89,14 +89,8 @@ import org.springframework.web.filter.GenericFilterBean; */ public class DigestAuthenticationFilter extends GenericFilterBean implements MessageSourceAware { - // ~ Static fields/initializers - // ===================================================================================== - private static final Log logger = LogFactory.getLog(DigestAuthenticationFilter.class); - // ~ Instance fields - // ================================================================================================ - private AuthenticationDetailsSource authenticationDetailsSource = new WebAuthenticationDetailsSource(); private DigestAuthenticationEntryPoint authenticationEntryPoint; @@ -111,9 +105,6 @@ public class DigestAuthenticationFilter extends GenericFilterBean implements Mes private boolean createAuthenticatedToken = false; - // ~ Methods - // ======================================================================================================== - @Override public void afterPropertiesSet() { Assert.notNull(this.userDetailsService, "A UserDetailsService is required"); diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java b/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java index 038e381c82..a2716bbef2 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java @@ -25,9 +25,6 @@ import org.springframework.security.core.AuthenticationException; */ public class NonceExpiredException extends AuthenticationException { - // ~ Constructors - // =================================================================================================== - /** * Constructs a NonceExpiredException with the specified message. * @param msg the detail message diff --git a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java index 9dce3f766c..4858607a06 100644 --- a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java @@ -253,9 +253,6 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo this.springSecurityContextKey = springSecurityContextKey; } - // ~ Inner Classes - // ================================================================================================== - private static class SaveToSessionRequestWrapper extends HttpServletRequestWrapper { private final SaveContextOnUpdateOrErrorResponseWrapper response; diff --git a/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java b/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java index 7646b895f1..c3a05e6fcc 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java +++ b/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java @@ -30,9 +30,6 @@ import javax.servlet.http.HttpServletResponse; */ public interface RequestRejectedHandler { - // ~ Methods - // ======================================================================================================== - /** * Handles an request rejected failure. * @param request that resulted in an RequestRejectedException diff --git a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java index ac4552870b..99ca04eba8 100644 --- a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java +++ b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java @@ -49,14 +49,8 @@ import org.springframework.web.filter.GenericFilterBean; */ public class JaasApiIntegrationFilter extends GenericFilterBean { - // ~ Instance fields - // ================================================================================================ - private boolean createEmptySubject; - // ~ Methods - // ======================================================================================================== - /** *

* Attempts to obtain and run as a JAAS Subject using diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java index efbdc8d546..1384bb8ae5 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java @@ -52,18 +52,12 @@ import java.util.*; */ public class DefaultSavedRequest implements SavedRequest { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(DefaultSavedRequest.class); private static final String HEADER_IF_NONE_MATCH = "If-None-Match"; private static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since"; - // ~ Instance fields - // ================================================================================================ - private final ArrayList cookies = new ArrayList<>(); private final ArrayList locales = new ArrayList<>(); @@ -92,9 +86,6 @@ public class DefaultSavedRequest implements SavedRequest { private final int serverPort; - // ~ Constructors - // =================================================================================================== - @SuppressWarnings("unchecked") public DefaultSavedRequest(HttpServletRequest request, PortResolver portResolver) { Assert.notNull(request, "Request required"); @@ -154,9 +145,6 @@ public class DefaultSavedRequest implements SavedRequest { this.serverPort = builder.serverPort; } - // ~ Methods - // ======================================================================================================== - /** * @since 4.2 */ diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java index cb3b1682bf..75cd7566fd 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java @@ -41,18 +41,12 @@ import java.util.NoSuchElementException; */ public class Enumerator implements Enumeration { - // ~ Instance fields - // ================================================================================================ - /** * The Iterator over which the Enumeration represented by * this class actually operates. */ private Iterator iterator = null; - // ~ Constructors - // =================================================================================================== - /** * Return an Enumeration over the values of the specified Collection. * @param collection Collection whose values should be enumerated @@ -116,9 +110,6 @@ public class Enumerator implements Enumeration { this(map.values().iterator(), clone); } - // ~ Methods - // ======================================================================================================== - /** * Tests if this enumeration contains more elements. * @return true if and only if this enumeration object contains at least diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java index 951f1c5b47..087a4c5b7a 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java @@ -35,9 +35,6 @@ import java.util.TimeZone; */ public class FastHttpDateFormat { - // ~ Static fields/initializers - // ===================================================================================== - /** HTTP date format. */ protected static final SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); @@ -70,9 +67,6 @@ public class FastHttpDateFormat { /** Parser cache. */ protected static final HashMap parseCache = new HashMap<>(); - // ~ Methods - // ======================================================================================================== - /** * Formats a specified date to HTTP format. If local format is not null, * it's used instead. diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java index b99eb5d8be..a8852f59cf 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java @@ -54,9 +54,6 @@ import org.apache.commons.logging.LogFactory; */ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { - // ~ Static fields/initializers - // ===================================================================================== - protected static final Log logger = LogFactory.getLog(SavedRequestAwareWrapper.class); protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT"); @@ -64,9 +61,6 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { /** The default Locale if none are specified. */ protected static Locale defaultLocale = Locale.getDefault(); - // ~ Instance fields - // ================================================================================================ - protected SavedRequest savedRequest = null; /** @@ -76,9 +70,6 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { */ protected final SimpleDateFormat[] formats = new SimpleDateFormat[3]; - // ~ Constructors - // =================================================================================================== - SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request) { super(request); savedRequest = saved; @@ -92,9 +83,6 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { formats[2].setTimeZone(GMT_ZONE); } - // ~ Methods - // ======================================================================================================== - @Override public long getDateHeader(String name) { String value = getHeader(name); diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java index 2b7727daca..d4742dc9b1 100644 --- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java +++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java @@ -68,9 +68,6 @@ import org.springframework.web.filter.GenericFilterBean; */ public class SecurityContextHolderAwareRequestFilter extends GenericFilterBean { - // ~ Instance fields - // ================================================================================================ - private String rolePrefix = "ROLE_"; private HttpServletRequestFactory requestFactory; @@ -83,9 +80,6 @@ public class SecurityContextHolderAwareRequestFilter extends GenericFilterBean { private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); - // ~ Methods - // ======================================================================================================== - public void setRolePrefix(String rolePrefix) { Assert.notNull(rolePrefix, "Role prefix must not be null"); this.rolePrefix = rolePrefix; diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java index 339e491a45..518352bf1f 100644 --- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java +++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java @@ -49,9 +49,6 @@ import org.springframework.util.Assert; */ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequestWrapper { - // ~ Instance fields - // ================================================================================================ - private final AuthenticationTrustResolver trustResolver; /** @@ -60,9 +57,6 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest */ private final String rolePrefix; - // ~ Constructors - // =================================================================================================== - /** * Creates a new instance with {@link AuthenticationTrustResolverImpl}. * @param request @@ -88,9 +82,6 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest this.trustResolver = trustResolver; } - // ~ Methods - // ======================================================================================================== - /** * Obtain the current active Authentication * @return the authentication object or null diff --git a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java index b8058b1627..cbd5404ec4 100644 --- a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java +++ b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java @@ -66,9 +66,6 @@ import org.springframework.web.filter.GenericFilterBean; */ public class ConcurrentSessionFilter extends GenericFilterBean { - // ~ Instance fields - // ================================================================================================ - private final SessionRegistry sessionRegistry; private String expiredUrl; @@ -79,9 +76,6 @@ public class ConcurrentSessionFilter extends GenericFilterBean { private SessionInformationExpiredStrategy sessionInformationExpiredStrategy; - // ~ Methods - // ======================================================================================================== - public ConcurrentSessionFilter(SessionRegistry sessionRegistry) { Assert.notNull(sessionRegistry, "SessionRegistry required"); this.sessionRegistry = sessionRegistry; diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java index 043ea86c5b..f9fe0d9721 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java @@ -29,9 +29,6 @@ import org.springframework.security.core.session.SessionCreationEvent; */ public class HttpSessionCreatedEvent extends SessionCreationEvent { - // ~ Constructors - // =================================================================================================== - public HttpSessionCreatedEvent(HttpSession session) { super(session); } diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java index ab483d3192..6d14edc90a 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java @@ -33,9 +33,6 @@ import java.util.*; */ public class HttpSessionDestroyedEvent extends SessionDestroyedEvent { - // ~ Constructors - // =================================================================================================== - public HttpSessionDestroyedEvent(HttpSession session) { super(session); } diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java index c73867825f..90e4ec18d3 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java @@ -46,14 +46,8 @@ import javax.servlet.http.HttpSessionListener; */ public class HttpSessionEventPublisher implements HttpSessionListener, HttpSessionIdListener { - // ~ Static fields/initializers - // ===================================================================================== - private static final String LOGGER_NAME = HttpSessionEventPublisher.class.getName(); - // ~ Methods - // ======================================================================================================== - ApplicationContext getContext(ServletContext servletContext) { return SecurityWebApplicationContextUtils.findRequiredWebApplicationContext(servletContext); } diff --git a/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java b/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java index bc68ed65da..1c9f342b2d 100644 --- a/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java +++ b/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java @@ -49,14 +49,8 @@ import org.springframework.web.filter.GenericFilterBean; */ public class SessionManagementFilter extends GenericFilterBean { - // ~ Static fields/initializers - // ===================================================================================== - static final String FILTER_APPLIED = "__spring_security_session_mgmt_filter_applied"; - // ~ Instance fields - // ================================================================================================ - private final SecurityContextRepository securityContextRepository; private SessionAuthenticationStrategy sessionAuthenticationStrategy; diff --git a/web/src/main/java/org/springframework/security/web/util/UrlUtils.java b/web/src/main/java/org/springframework/security/web/util/UrlUtils.java index 1667591f37..1d8ba499b0 100644 --- a/web/src/main/java/org/springframework/security/web/util/UrlUtils.java +++ b/web/src/main/java/org/springframework/security/web/util/UrlUtils.java @@ -30,9 +30,6 @@ import javax.servlet.http.HttpServletRequest; */ public final class UrlUtils { - // ~ Methods - // ======================================================================================================== - public static String buildFullRequestUrl(HttpServletRequest r) { return buildFullRequestUrl(r.getScheme(), r.getServerName(), r.getServerPort(), r.getRequestURI(), r.getQueryString()); diff --git a/web/src/test/java/org/springframework/security/MockFilterConfig.java b/web/src/test/java/org/springframework/security/MockFilterConfig.java index 6ed79fa574..a105de9600 100644 --- a/web/src/test/java/org/springframework/security/MockFilterConfig.java +++ b/web/src/test/java/org/springframework/security/MockFilterConfig.java @@ -29,13 +29,8 @@ import javax.servlet.ServletContext; @SuppressWarnings("unchecked") public class MockFilterConfig implements FilterConfig { - // ~ Instance fields - // ================================================================================================ private Map map = new HashMap(); - // ~ Methods - // ======================================================================================================== - public String getFilterName() { throw new UnsupportedOperationException("mock method not implemented"); } diff --git a/web/src/test/java/org/springframework/security/MockPortResolver.java b/web/src/test/java/org/springframework/security/MockPortResolver.java index c33fe3ec83..b06d4af07c 100644 --- a/web/src/test/java/org/springframework/security/MockPortResolver.java +++ b/web/src/test/java/org/springframework/security/MockPortResolver.java @@ -27,24 +27,15 @@ import javax.servlet.ServletRequest; */ public class MockPortResolver implements PortResolver { - // ~ Instance fields - // ================================================================================================ - private int http = 80; private int https = 443; - // ~ Constructors - // =================================================================================================== - public MockPortResolver(int http, int https) { this.http = http; this.https = https; } - // ~ Methods - // ======================================================================================================== - public int getServerPort(ServletRequest request) { if ((request.getScheme() != null) && request.getScheme().equals("https")) { return https; diff --git a/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java b/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java index 297fa9df51..a17c05cbfc 100644 --- a/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java +++ b/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java @@ -37,9 +37,6 @@ import org.springframework.security.web.util.UrlUtils; */ public class FilterInvocationTests { - // ~ Methods - // ======================================================================================================== - @Test public void testGettersAndStringMethods() { MockHttpServletRequest request = new MockHttpServletRequest(null, null); diff --git a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java index b5424520e6..1c4a6db3c7 100644 --- a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java @@ -31,8 +31,6 @@ import org.junit.Test; */ public class PortMapperImplTests { - // ~ Methods - // ======================================================================================================== @Test public void testDefaultMappingsAreKnown() { PortMapperImpl portMapper = new PortMapperImpl(); diff --git a/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java index 5778c4eee7..7a8f1f16ec 100644 --- a/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java @@ -29,8 +29,6 @@ import org.springframework.mock.web.MockHttpServletRequest; */ public class PortResolverImplTests { - // ~ Methods - // ======================================================================================================== @Test public void testDetectsBuggyIeHttpRequest() { PortResolverImpl pr = new PortResolverImpl(); diff --git a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java index aa8e3e5e19..8337dc2cf1 100644 --- a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java @@ -48,9 +48,6 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { private FilterSecurityInterceptor interceptor; - // ~ Methods - // ======================================================================================================== - @Before public final void setUp() { interceptor = new FilterSecurityInterceptor(); diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java index e9f5b16e6f..3febacc27e 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java @@ -44,8 +44,6 @@ import static org.mockito.Mockito.mock; @SuppressWarnings("unchecked") public class ChannelDecisionManagerImplTests { - // ~ Methods - // ======================================================================================================== @Test public void testCannotSetEmptyChannelProcessorsList() throws Exception { ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl(); @@ -190,9 +188,6 @@ public class ChannelDecisionManagerImplTests { } } - // ~ Inner Classes - // ================================================================================================== - private class MockChannelProcessor implements ChannelProcessor { private String configAttribute; diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java index 98aa2cf4e1..db85f0540a 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java @@ -39,9 +39,6 @@ import org.springframework.security.web.access.intercept.FilterInvocationSecurit */ public class ChannelProcessingFilterTests { - // ~ Methods - // ======================================================================================================== - @Test(expected = IllegalArgumentException.class) public void testDetectsMissingChannelDecisionManager() { ChannelProcessingFilter filter = new ChannelProcessingFilter(); @@ -152,9 +149,6 @@ public class ChannelProcessingFilterTests { filter.afterPropertiesSet(); } - // ~ Inner Classes - // ================================================================================================== - private class MockChannelDecisionManager implements ChannelDecisionManager { private String supportAttribute; diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java index 5e4d57987a..bf67247ff3 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java @@ -40,8 +40,6 @@ import static org.mockito.Mockito.mock; */ public class RetryWithHttpEntryPointTests { - // ~ Methods - // ======================================================================================================== @Test public void testDetectsMissingPortMapper() { RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint(); diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java index 33c4bff1b4..f41efbcabc 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java @@ -36,8 +36,6 @@ import java.util.Map; */ public class RetryWithHttpsEntryPointTests { - // ~ Methods - // ======================================================================================================== @Test public void testDetectsMissingPortMapper() { RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint(); diff --git a/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java index 346a599123..ed32daf7a2 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java @@ -35,8 +35,6 @@ import org.springframework.security.web.access.channel.SecureChannelProcessor; */ public class SecureChannelProcessorTests { - // ~ Methods - // ======================================================================================================== @Test public void testDecideDetectsAcceptableChannel() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java index 18b634a5fd..5f207669bc 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java @@ -45,8 +45,6 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { private Collection def = SecurityConfig.createList("ROLE_ONE"); - // ~ Methods - // ======================================================================================================== private void createFids(String pattern, String method) { LinkedHashMap> requestMap = new LinkedHashMap<>(); requestMap.put(new AntPathRequestMatcher(pattern, method), this.def); diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java index b5e464c07d..34d8b79cf4 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java @@ -62,9 +62,6 @@ public class FilterSecurityInterceptorTests { private ApplicationEventPublisher publisher; - // ~ Methods - // ======================================================================================================== - @Before public final void setUp() { interceptor = new FilterSecurityInterceptor(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java index 47431f43eb..f6690cd940 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java @@ -68,9 +68,6 @@ public class AbstractAuthenticationProcessingFilterTests { SimpleUrlAuthenticationFailureHandler failureHandler; - // ~ Methods - // ======================================================================================================== - private MockHttpServletRequest createMockAuthenticationRequest() { MockHttpServletRequest request = new MockHttpServletRequest(); @@ -476,9 +473,6 @@ public class AbstractAuthenticationProcessingFilterTests { filter.setRememberMeServices(null); } - // ~ Inner Classes - // ================================================================================================== - private class MockAuthenticationFilter extends AbstractAuthenticationProcessingFilter { private static final String DEFAULT_FILTER_PROCESSING_URL = "/j_mock_post"; diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java index 821a51e1e8..0816a26477 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java @@ -48,9 +48,6 @@ import static org.mockito.Mockito.mock; */ public class AnonymousAuthenticationFilterTests { - // ~ Methods - // ======================================================================================================== - private void executeFilterInContainerSimulator(FilterConfig filterConfig, Filter filter, ServletRequest request, ServletResponse response, FilterChain filterChain) throws ServletException, IOException { filter.doFilter(request, response, filterChain); @@ -109,9 +106,6 @@ public class AnonymousAuthenticationFilterTests { // again } - // ~ Inner Classes - // ================================================================================================== - private class MockFilterChain implements FilterChain { private boolean expectToProceed; diff --git a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java index 35712c9402..8919062fe8 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java @@ -34,9 +34,6 @@ import org.springframework.security.web.PortMapperImpl; */ public class LoginUrlAuthenticationEntryPointTests { - // ~ Methods - // ======================================================================================================== - @Test(expected = IllegalArgumentException.class) public void testDetectsMissingLoginFormUrl() { new LoginUrlAuthenticationEntryPoint(null); diff --git a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java index 5e5f90f816..84b3986697 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java @@ -35,9 +35,6 @@ import org.springframework.security.core.AuthenticationException; */ public class UsernamePasswordAuthenticationFilterTests { - // ~ Methods - // ======================================================================================================== - @Test public void testNormalOperation() { MockHttpServletRequest request = new MockHttpServletRequest("POST", "/"); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java index 5c09f1b327..1649e9468b 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java @@ -27,9 +27,6 @@ import java.security.cert.X509Certificate; */ public class X509TestUtils { - // ~ Methods - // ======================================================================================================== - /** * Builds an X.509 certificate. In human-readable form it is: * diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java index 122089f5a0..396d067d24 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java @@ -482,9 +482,6 @@ public class AbstractRememberMeServicesTests { assertThat(returnedCookie.getMaxAge()).isZero(); } - // ~ Inner Classes - // ================================================================================================== - static class MockRememberMeServices extends AbstractRememberMeServices { boolean loginSuccessCalled; diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java index 5155b88e6a..2c68d151ed 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java @@ -28,8 +28,6 @@ import org.springframework.security.web.authentication.NullRememberMeServices; */ public class NullRememberMeServicesTests { - // ~ Methods - // ======================================================================================================== @Test public void testAlwaysReturnsNull() { NullRememberMeServices services = new NullRememberMeServices(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java index 852b08844f..8680042509 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java @@ -46,9 +46,6 @@ public class RememberMeAuthenticationFilterTests { Authentication remembered = new TestingAuthenticationToken("remembered", "password", "ROLE_REMEMBERED"); - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { SecurityContextHolder.clearContext(); @@ -155,9 +152,6 @@ public class RememberMeAuthenticationFilterTests { verifyZeroInteractions(fc); } - // ~ Inner Classes - // ================================================================================================== - private class MockRememberMeServices implements RememberMeServices { private Authentication authToReturn; diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java index 01fc2eb9b9..940bc7b468 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java @@ -54,9 +54,6 @@ public class TokenBasedRememberMeServicesTests { private TokenBasedRememberMeServices services; - // ~ Methods - // ======================================================================================================== - @Before public void createTokenBasedRememberMeServices() { uds = mock(UserDetailsService.class); diff --git a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java index f9713974d2..47ad26bdc0 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java @@ -547,8 +547,6 @@ public class SwitchUserFilterTests { SwitchUserFilter filter = new SwitchUserFilter(); filter.setSwitchFailureUrl("/foo"); } - // ~ Inner Classes - // ================================================================================================== private class MockUserDetailsService implements UserDetailsService { diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java index f3deabd231..b592cf3150 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java @@ -50,16 +50,10 @@ import java.nio.charset.StandardCharsets; */ public class BasicAuthenticationFilterTests { - // ~ Instance fields - // ================================================================================================ - private BasicAuthenticationFilter filter; private AuthenticationManager manager; - // ~ Methods - // ======================================================================================================== - @Before public void setUp() { SecurityContextHolder.clearContext(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java index 9f2623c2e4..4fe571904c 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java @@ -31,11 +31,6 @@ import org.springframework.util.StringUtils; */ public class DigestAuthUtilsTests { - // ~ Constructors - // =================================================================================================== - - // ~ Methods - // ======================================================================================================== @Test public void testSplitEachArrayElementAndCreateMapNormalOperation() { // note it ignores malformed entries (ie those without an equals sign) diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java index 4c2360ec46..adfe482442 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java @@ -37,9 +37,6 @@ import static org.assertj.core.api.Assertions.fail; */ public class DigestAuthenticationEntryPointTests { - // ~ Methods - // ======================================================================================================== - private void checkNonceValid(String nonce) { // Check the nonce seems to be generated correctly // format of nonce is: diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java index cb85338d7e..55d77f89d5 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java @@ -54,9 +54,6 @@ import static org.mockito.Mockito.verify; */ public class DigestAuthenticationFilterTests { - // ~ Static fields/initializers - // ===================================================================================== - private static final String NC = "00000002"; private static final String CNONCE = "c822c727a648aba7"; @@ -78,17 +75,11 @@ public class DigestAuthenticationFilterTests { */ private static final String NONCE = generateNonce(60); - // ~ Instance fields - // ================================================================================================ - // private ApplicationContext ctx; private DigestAuthenticationFilter filter; private MockHttpServletRequest request; - // ~ Methods - // ======================================================================================================== - private String createAuthorizationHeader(String username, String realm, String nonce, String uri, String responseDigest, String qop, String nc, String cnonce) { return "Digest username=\"" + username + "\", realm=\"" + realm + "\", nonce=\"" + nonce + "\", uri=\"" + uri diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java index 6f1572445a..6dd353faf5 100644 --- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java @@ -57,8 +57,6 @@ import org.springframework.security.core.context.SecurityContextHolder; */ public class JaasApiIntegrationFilterTests { - // ~ Instance fields - // ================================================================================================ private JaasApiIntegrationFilter filter; private MockHttpServletRequest request; @@ -73,9 +71,6 @@ public class JaasApiIntegrationFilterTests { private CallbackHandler callbackHandler; - // ~ Methods - // ======================================================================================================== - @Before public void onBeforeTests() throws Exception { this.filter = new JaasApiIntegrationFilter(); @@ -193,9 +188,6 @@ public class JaasApiIntegrationFilterTests { assertJaasSubjectEquals(new Subject()); } - // ~ Helper Methods - // ==================================================================================================== - private void assertJaasSubjectEquals(final Subject expectedValue) throws Exception { MockFilterChain chain = new MockFilterChain() { diff --git a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java index 8c0ec8c93f..c491112085 100644 --- a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java @@ -113,9 +113,6 @@ public class SecurityContextHolderAwareRequestFilterTests { SecurityContextHolder.clearContext(); } - // ~ Methods - // ======================================================================================================== - @Test public void expectedRequestWrapperClassIsUsed() throws Exception { this.filter.setRolePrefix("ROLE_"); diff --git a/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java index 03336ec164..4f577f9d36 100644 --- a/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java +++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java @@ -33,9 +33,6 @@ import org.springframework.web.context.support.StaticWebApplicationContext; */ public class HttpSessionEventPublisherTests { - // ~ Methods - // ======================================================================================================== - /** * It's not that complicated so we'll just run it straight through here. */ diff --git a/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java index b9e97ede57..2996f80ee0 100644 --- a/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java +++ b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java @@ -28,18 +28,12 @@ import org.springframework.security.web.session.HttpSessionDestroyedEvent; */ public class MockApplicationListener implements ApplicationListener { - // ~ Instance fields - // ================================================================================================ - private HttpSessionCreatedEvent createdEvent; private HttpSessionDestroyedEvent destroyedEvent; private HttpSessionIdChangedEvent sessionIdChangedEvent; - // ~ Methods - // ======================================================================================================== - public HttpSessionCreatedEvent getCreatedEvent() { return createdEvent; }