Cleanup Code Style Issues

Cleanup Code Style Issues

Author: rwinch

acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java

@@ -41,14 +41,14 @@ class AclClassIdUtils {
 
 	private ConversionService conversionService;
 
-	public AclClassIdUtils() {
+	AclClassIdUtils() {
 		GenericConversionService genericConversionService = new GenericConversionService();
 		genericConversionService.addConverter(String.class, Long.class, new StringToLongConverter());
 		genericConversionService.addConverter(String.class, UUID.class, new StringToUUIDConverter());
 		this.conversionService = genericConversionService;
 	}
 
-	public AclClassIdUtils(ConversionService conversionService) {
+	AclClassIdUtils(ConversionService conversionService) {
 		Assert.notNull(conversionService, "conversionService must not be null");
 		this.conversionService = conversionService;
 	}

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -559,7 +559,7 @@ private class ProcessResultSet implements ResultSetExtractor<Set<Long>> {
 		private final Map<Serializable, Acl> acls;
 		private final List<Sid> sids;
 
-		public ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
+		ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
 			Assert.notNull(acls, "ACLs cannot be null");
 			this.acls = acls;
 			this.sids = sids; // can be null
@@ -683,7 +683,7 @@ private void convertCurrentResultIntoObject(Map<Serializable, Acl> acls,
 	private static class StubAclParent implements Acl {
 		private final Long id;
 
-		public StubAclParent(Long id) {
+		StubAclParent(Long id) {
 			this.id = id;
 		}
 

cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java

@@ -55,8 +55,8 @@ class AssertionImplMixin {
 	 * @param attributes the key/value pairs for this attribute.
 	 */
 	@JsonCreator
-	public AssertionImplMixin(@JsonProperty("principal") AttributePrincipal principal,
+	AssertionImplMixin(@JsonProperty("principal") AttributePrincipal principal,
 								@JsonProperty("validFromDate") Date validFromDate, @JsonProperty("validUntilDate") Date validUntilDate,
 								@JsonProperty("authenticationDate") Date authenticationDate, @JsonProperty("attributes") Map<String, Object> attributes){
 	}
-}
+}

cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java

@@ -51,8 +51,8 @@ class AttributePrincipalImplMixin {
 	 * @param proxyRetriever the ProxyRetriever implementation to call back to the CAS server.
 	 */
 	@JsonCreator
-	public AttributePrincipalImplMixin(@JsonProperty("name") String name, @JsonProperty("attributes") Map<String, Object> attributes,
+	AttributePrincipalImplMixin(@JsonProperty("name") String name, @JsonProperty("attributes") Map<String, Object> attributes,
 										@JsonProperty("proxyGrantingTicket") String proxyGrantingTicket,
 										@JsonProperty("proxyRetriever") ProxyRetriever proxyRetriever) {
 	}
-}
+}

cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java

@@ -69,7 +69,7 @@ class CasAuthenticationTokenMixin {
 	 * principal and how to obtain a proxy ticket for the user.
 	 */
 	@JsonCreator
-	public CasAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal,
+	CasAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal,
 										@JsonProperty("credentials") Object credentials,
 										@JsonProperty("authorities") Collection<? extends GrantedAuthority> authorities,
 										@JsonProperty("userDetails") UserDetails userDetails, @JsonProperty("assertion") Assertion assertion) {

cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java

@@ -415,7 +415,7 @@ private boolean proxyReceptorConfigured() {
 	private class CasAuthenticationFailureHandler implements AuthenticationFailureHandler {
 		private final AuthenticationFailureHandler serviceTicketFailureHandler;
 
-		public CasAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
+		CasAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
 			Assert.notNull(failureHandler, "failureHandler");
 			this.serviceTicketFailureHandler = failureHandler;
 		}
@@ -432,4 +432,4 @@ public void onAuthenticationFailure(HttpServletRequest request,
 			}
 		}
 	}
-}
+}

cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java

@@ -414,7 +414,7 @@ public void removeTicketFromCache(String serviceTicket) {
 	private class MockTicketValidator implements TicketValidator {
 		private boolean returnTicket;
 
-		public MockTicketValidator(boolean returnTicket) {
+		MockTicketValidator(boolean returnTicket) {
 			this.returnTicket = returnTicket;
 		}
 

config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java

@@ -58,7 +58,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 	private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers = new LinkedHashMap<>();
 	private final List<SecurityConfigurer<O, B>> configurersAddedInInitializing = new ArrayList<>();
 
-	private final Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();
+	private final Map<Class<?>, Object> sharedObjects = new HashMap<>();
 
 	private final boolean allowConfigurersOfSameType;
 
@@ -174,7 +174,7 @@ public <C> C getSharedObject(Class<C> sharedType) {
 	 * Gets the shared objects
 	 * @return the shared Objects
 	 */
-	public Map<Class<? extends Object>, Object> getSharedObjects() {
+	public Map<Class<?>, Object> getSharedObjects() {
 		return Collections.unmodifiableMap(this.sharedObjects);
 	}
 
@@ -409,7 +409,7 @@ private boolean isUnbuilt() {
 	 * @author Rob Winch
 	 * @since 3.2
 	 */
-	private static enum BuildState {
+	private enum BuildState {
 		/**
 		 * This is the state before the {@link Builder#build()} is invoked
 		 */

config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java

@@ -110,7 +110,7 @@ public void setBuilder(B builder) {
 	 */
 	private static final class CompositeObjectPostProcessor implements
 			ObjectPostProcessor<Object> {
-		private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<>();
+		private List<ObjectPostProcessor<?>> postProcessors = new ArrayList<>();
 
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		public Object postProcess(Object object) {
@@ -131,7 +131,7 @@ public Object postProcess(Object object) {
 		 * @return true if the {@link ObjectPostProcessor} was added, else false
 		 */
 		private boolean addObjectPostProcessor(
-				ObjectPostProcessor<? extends Object> objectPostProcessor) {
+				ObjectPostProcessor<?> objectPostProcessor) {
 			boolean result = this.postProcessors.add(objectPostProcessor);
 			postProcessors.sort(AnnotationAwareOrderComparator.INSTANCE);
 			return result;

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java

@@ -193,7 +193,7 @@ private static class EnableGlobalAuthenticationAutowiredConfigurer extends
 		private static final Log logger = LogFactory
 				.getLog(EnableGlobalAuthenticationAutowiredConfigurer.class);
 
-		public EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
+		EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
 			this.context = context;
 		}