Rename poorly named withUser variable

WithSecurityContextTestExecutionListener used the variable name withUser
in mulitple places when it should have been named withSecurityContext.

This commit renames the variables to withSecurityContext.

Fixes gh-3775
This commit is contained in:
Rob Winch 2016-04-01 10:27:14 -05:00
parent 9c3db557dd
commit 8abb882927

View File

@ -66,10 +66,10 @@ public class WithSecurityContextTestExecutionListener extends
@SuppressWarnings({ "rawtypes", "unchecked" })
private SecurityContext createSecurityContext(AnnotatedElement annotated,
TestContext context) {
WithSecurityContext withUser = AnnotationUtils.findAnnotation(
WithSecurityContext withSecurityContext = AnnotationUtils.findAnnotation(
annotated, WithSecurityContext.class);
if (withUser != null) {
WithSecurityContextFactory factory = createFactory(withUser, context);
if (withSecurityContext != null) {
WithSecurityContextFactory factory = createFactory(withSecurityContext, context);
Class<? extends Annotation> type = (Class<? extends Annotation>) GenericTypeResolver.resolveTypeArgument(factory.getClass(), WithSecurityContextFactory.class);
Annotation annotation = AnnotationUtils.findAnnotation(annotated, type);
try {
@ -84,8 +84,8 @@ public class WithSecurityContextTestExecutionListener extends
}
private WithSecurityContextFactory<? extends Annotation> createFactory(
WithSecurityContext withUser, TestContext testContext) {
Class<? extends WithSecurityContextFactory<? extends Annotation>> clazz = withUser
WithSecurityContext withSecurityContext, TestContext testContext) {
Class<? extends WithSecurityContextFactory<? extends Annotation>> clazz = withSecurityContext
.factory();
try {
return testContext.getApplicationContext().getAutowireCapableBeanFactory().createBean(clazz);