[WICKET-3246] AnnotProxyFieldValueFactory getBeanNameOfClass move if-test outside of while-loop

• Type: Improvement
• Status: Resolved
• Priority: Trivial
• Resolution: Fixed
• Affects Version/s: 1.5-M3
• Fix Version/s: 1.5-RC1
• Component/s: wicket-spring
• Environment: all
• Assignee: Unassigned
• Reporter: Richard Emberson
• Created: 09/Dec/10 16:05
• Updated: 11/Dec/10 17:24
• Resolved: 11/Dec/10 17:24

Description

Same issue as https://issues.apache.org/jira/browse/WICKET-3245
Move the if-test outside of while-loop

from:

Iterator<String> it = names.iterator();
while (it.hasNext())
{
final String possibility = it.next();
if (ctx instanceof AbstractApplicationContext)
{
BeanDefinition beanDef = getBeanDefinition(((AbstractApplicationContext)ctx)
.getBeanFactory(), possibility);
if (BeanFactoryUtils.isFactoryDereference(possibility) ||
possibility.startsWith("scopedTarget.") || !beanDef.isAutowireCandidate())

{ it.remove(); }
}
}

to:

if (ctx instanceof AbstractApplicationContext)
{
Iterator<String> it = names.iterator();
while (it.hasNext())
{
final String possibility = it.next();
BeanDefinition beanDef = getBeanDefinition(((AbstractApplicationContext)ctx)
.getBeanFactory(), possibility);
if (BeanFactoryUtils.isFactoryDereference(possibility) ||
possibility.startsWith("scopedTarget.") || !beanDef.isAutowireCandidate())
{ it.remove(); }

}
}