From 54a300e009cdbdb8ead165df709f8f0d392d818e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 5 Apr 2012 16:23:38 -0700 Subject: [PATCH] Change signatures to make use of Java 5 varargs Issues: SWF-1532 --- .../expression/support/CompositeStringExpression.java | 2 +- .../binding/expression/support/FluentParserContext.java | 2 +- .../org/springframework/binding/message/MessageBuilder.java | 6 +++--- .../java/org/springframework/binding/method/MethodKey.java | 2 +- .../java/org/springframework/binding/method/Parameters.java | 4 ++-- .../org/springframework/faces/webflow/FlowApplication.java | 4 ++-- .../faces/webflow/FlowActionListenerTests.java | 2 +- .../org/springframework/faces/webflow/MockApplication.java | 2 +- .../org/springframework/webflow/action/CompositeAction.java | 2 +- .../webflow/action/DispatchMethodInvoker.java | 4 ++-- .../org/springframework/webflow/action/RenderAction.java | 6 +++--- .../webflow/config/FlowRegistryFactoryBean.java | 6 +++--- .../webflow/core/collection/CollectionUtils.java | 4 ++-- .../java/org/springframework/webflow/engine/ActionList.java | 2 +- .../main/java/org/springframework/webflow/engine/Flow.java | 2 +- .../webflow/engine/FlowExecutionExceptionHandlerSet.java | 2 +- .../org/springframework/webflow/engine/TransitionSet.java | 2 +- .../java/org/springframework/webflow/engine/ViewState.java | 2 +- .../webflow/engine/impl/FlowExecutionListeners.java | 2 +- .../webflow/engine/support/ActionTransitionCriteria.java | 4 ++-- .../webflow/engine/support/TransitionCriteriaChain.java | 4 ++-- .../factory/FlowExecutionListenerCriteriaFactory.java | 6 +++--- .../factory/StaticFlowExecutionListenerLoader.java | 6 +++--- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java index e868e9a4..b447c39f 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java @@ -36,7 +36,7 @@ public class CompositeStringExpression implements Expression { * @param expressions the ordered set of expressions that when evaluated will have their results stringed together * to build the composite string */ - public CompositeStringExpression(Expression[] expressions) { + public CompositeStringExpression(Expression... expressions) { this.expressions = expressions; } diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/FluentParserContext.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/FluentParserContext.java index f1341823..4a9f54bd 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/FluentParserContext.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/support/FluentParserContext.java @@ -99,7 +99,7 @@ public class FluentParserContext implements ParserContext { * @param variables the expression variables * @return this */ - public FluentParserContext variables(ExpressionVariable[] variables) { + public FluentParserContext variables(ExpressionVariable... variables) { expressionVariables.addAll(Arrays.asList(variables)); return this; } diff --git a/spring-binding/src/main/java/org/springframework/binding/message/MessageBuilder.java b/spring-binding/src/main/java/org/springframework/binding/message/MessageBuilder.java index b95adc9d..f05e3130 100644 --- a/spring-binding/src/main/java/org/springframework/binding/message/MessageBuilder.java +++ b/spring-binding/src/main/java/org/springframework/binding/message/MessageBuilder.java @@ -117,7 +117,7 @@ public class MessageBuilder { * @param codes the message codes; if null, no changes will be made * @return this, for fluent API usage */ - public MessageBuilder codes(String[] codes) { + public MessageBuilder codes(String... codes) { if (codes == null) { return this; } @@ -142,7 +142,7 @@ public class MessageBuilder { * @param args the message argument values, if null no changes will be made * @return this, for fluent API usage */ - public MessageBuilder args(Object[] args) { + public MessageBuilder args(Object... args) { if (args == null) { return this; } @@ -169,7 +169,7 @@ public class MessageBuilder { * @param args the resolvable message arguments * @return this, for fluent API usage */ - public MessageBuilder resolvableArgs(Object[] args) { + public MessageBuilder resolvableArgs(Object... args) { if (args == null) { return this; } diff --git a/spring-binding/src/main/java/org/springframework/binding/method/MethodKey.java b/spring-binding/src/main/java/org/springframework/binding/method/MethodKey.java index ad6b55cc..a5076b37 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/MethodKey.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/MethodKey.java @@ -58,7 +58,7 @@ public class MethodKey implements Serializable { * @param methodName the method name * @param parameterTypes the method's parameter types, or null if the method has no parameters */ - public MethodKey(Class declaredType, String methodName, Class[] parameterTypes) { + public MethodKey(Class declaredType, String methodName, Class... parameterTypes) { Assert.notNull(declaredType, "The method's declared type is required"); Assert.notNull(methodName, "The method name is required"); this.declaredType = declaredType; diff --git a/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java b/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java index 2978abdf..a3cb1019 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java @@ -65,7 +65,7 @@ public class Parameters { * Create a parameter list from the parameter array. * @param parameters the parameters */ - public Parameters(Parameter[] parameters) { + public Parameters(Parameter... parameters) { this.parameters = new ArrayList(parameters.length); addAll(parameters); } @@ -82,7 +82,7 @@ public class Parameters { * Add new parameters to this list. * @param parameters the parameters */ - public boolean addAll(Parameter[] parameters) { + public boolean addAll(Parameter... parameters) { return this.parameters.addAll(Arrays.asList(parameters)); } diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplication.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplication.java index e84d4298..39157d5e 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplication.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2010 the original author or authors. + * Copyright 2004-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -161,7 +161,7 @@ public class FlowApplication extends Application { return delegate.createConverter(targetClass); } - public MethodBinding createMethodBinding(String ref, Class[] params) throws ReferenceSyntaxException { + public MethodBinding createMethodBinding(String ref, Class... params) throws ReferenceSyntaxException { return delegate.createMethodBinding(ref, params); } diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/FlowActionListenerTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowActionListenerTests.java index 2c90045f..1847c7a8 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/FlowActionListenerTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowActionListenerTests.java @@ -83,7 +83,7 @@ public class FlowActionListenerTests extends TestCase { return String.class; } - public Object invoke(FacesContext context, Object[] args) throws EvaluationException, MethodNotFoundException { + public Object invoke(FacesContext context, Object... args) throws EvaluationException, MethodNotFoundException { return this.result; } diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java index 637f345b..9abbff24 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java @@ -141,7 +141,7 @@ public class MockApplication extends Application { return null; } - public MethodBinding createMethodBinding(String ref, Class[] params) throws ReferenceSyntaxException { + public MethodBinding createMethodBinding(String ref, Class... params) throws ReferenceSyntaxException { return null; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/CompositeAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/CompositeAction.java index ca3ecdcc..2420ebe3 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/CompositeAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/CompositeAction.java @@ -62,7 +62,7 @@ public class CompositeAction extends AbstractAction { * Create a composite action composed of given actions. * @param actions the actions */ - public CompositeAction(Action[] actions) { + public CompositeAction(Action... actions) { Assert.notEmpty(actions, "At least one action is required"); this.actions = actions; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/DispatchMethodInvoker.java b/spring-webflow/src/main/java/org/springframework/webflow/action/DispatchMethodInvoker.java index c56b0b74..a00f48d2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/DispatchMethodInvoker.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/DispatchMethodInvoker.java @@ -64,7 +64,7 @@ class DispatchMethodInvoker { * @param target the target to dispatch to * @param parameterTypes the parameter types defining the argument signature of the dispatch methods */ - public DispatchMethodInvoker(Object target, Class[] parameterTypes) { + public DispatchMethodInvoker(Object target, Class... parameterTypes) { Assert.notNull(target, "The target of a dispatch method invocation is required"); this.target = target; this.parameterTypes = parameterTypes; @@ -92,7 +92,7 @@ class DispatchMethodInvoker { * @throws MethodLookupException when the method cannot be resolved * @throws Exception when the invoked method throws an exception */ - public Object invoke(String methodName, Object[] arguments) throws MethodLookupException, Exception { + public Object invoke(String methodName, Object... arguments) throws MethodLookupException, Exception { try { Method dispatchMethod = getDispatchMethod(methodName); return dispatchMethod.invoke(target, arguments); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/RenderAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/RenderAction.java index ffaf7d58..c74f82b6 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/RenderAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/RenderAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008 the original author or authors. + * Copyright 2004-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public class RenderAction extends AbstractAction { * Creates a new render action. * @param fragmentExpressions the set of expressions to resolve the view fragments to render */ - public RenderAction(Expression[] fragmentExpressions) { + public RenderAction(Expression... fragmentExpressions) { if (fragmentExpressions == null || fragmentExpressions.length == 0) { throw new IllegalArgumentException( "You must provide at least one fragment expression to this render action"); @@ -59,4 +59,4 @@ public class RenderAction extends AbstractAction { public String toString() { return new ToStringCreator(this).append("fragments", fragmentExpressions).toString(); } -} \ No newline at end of file +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java index c156bb0d..3e742f87 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java @@ -85,14 +85,14 @@ class FlowRegistryFactoryBean implements FactoryBean, Be * Flow definitions defined in external files that should be registered in the registry produced by this factory * bean. */ - public void setFlowLocations(FlowLocation[] flowLocations) { + public void setFlowLocations(FlowLocation... flowLocations) { this.flowLocations = flowLocations; } /** * Resolvable path patterns to flows to register in the registry produced by this factory bean. */ - public void setFlowLocationPatterns(String[] flowLocationPatterns) { + public void setFlowLocationPatterns(String... flowLocationPatterns) { this.flowLocationPatterns = flowLocationPatterns; } @@ -100,7 +100,7 @@ class FlowRegistryFactoryBean implements FactoryBean, Be * Java {@link FlowBuilder flow builder} classes that should be registered in the registry produced by this factory * bean. */ - public void setFlowBuilders(FlowBuilderInfo[] flowBuilders) { + public void setFlowBuilders(FlowBuilderInfo... flowBuilders) { this.flowBuilders = flowBuilders; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/collection/CollectionUtils.java b/spring-webflow/src/main/java/org/springframework/webflow/core/collection/CollectionUtils.java index f4336eaa..d67eb1d0 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/core/collection/CollectionUtils.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/core/collection/CollectionUtils.java @@ -78,7 +78,7 @@ public class CollectionUtils { * @param objects the objects to add * @return whether or not the target collection changed */ - public static boolean addAllNoDuplicates(List target, T[] objects) { + public static boolean addAllNoDuplicates(List target, T... objects) { if (objects == null || objects.length == 0) { return false; } else { @@ -137,4 +137,4 @@ public class CollectionUtils { throw new UnsupportedOperationException("Not supported"); } } -} +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java index 820cfd47..0c7306c3 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java @@ -59,7 +59,7 @@ public class ActionList implements Iterable { * @param actions the actions to add * @return true if this list's contents changed as a result of the add operation */ - public boolean addAll(Action[] actions) { + public boolean addAll(Action... actions) { if (actions == null) { return false; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java index d4880556..d65c671a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java @@ -369,7 +369,7 @@ public class Flow extends AnnotatedObject implements FlowDefinition { * Adds flow variables. * @param variables the variables */ - public void addVariables(FlowVariable[] variables) { + public void addVariables(FlowVariable... variables) { if (variables == null) { return; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java index ea3e214a..8ea71d02 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java @@ -56,7 +56,7 @@ public class FlowExecutionExceptionHandlerSet { * @param exceptionHandlers the exception handlers to add * @return true if this set's contents changed as a result of the add operation */ - public boolean addAll(FlowExecutionExceptionHandler[] exceptionHandlers) { + public boolean addAll(FlowExecutionExceptionHandler... exceptionHandlers) { return CollectionUtils.addAllNoDuplicates(this.exceptionHandlers, exceptionHandlers); } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionSet.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionSet.java index 431d1417..93ac4ccc 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionSet.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionSet.java @@ -55,7 +55,7 @@ public class TransitionSet implements Iterable { * @param transitions the transitions to add * @return true if this set's contents changed as a result of the add operation */ - public boolean addAll(Transition[] transitions) { + public boolean addAll(Transition... transitions) { return CollectionUtils.addAllNoDuplicates(this.transitions, transitions); } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java index 06fa1b7b..43e58354 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java @@ -96,7 +96,7 @@ public class ViewState extends TransitionableState { * Adds a set of view variables. * @param variables the variables */ - public void addVariables(ViewVariable[] variables) { + public void addVariables(ViewVariable... variables) { for (ViewVariable variable : variables) { addVariable(variable); } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java index f3909723..4e35360c 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java @@ -56,7 +56,7 @@ class FlowExecutionListeners { * Create a flow execution listener helper that wraps the specified listener array. * @param listeners the listener array */ - public FlowExecutionListeners(FlowExecutionListener[] listeners) { + public FlowExecutionListeners(FlowExecutionListener... listeners) { if (listeners != null) { this.listeners = listeners; } else { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java index 28c05fef..54fcea6f 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java @@ -66,7 +66,7 @@ public class ActionTransitionCriteria implements TransitionCriteria { * false otherwise). * @param trueEventIds the true result event IDs */ - public void setTrueEventIds(String[] trueEventIds) { + public void setTrueEventIds(String... trueEventIds) { this.trueEventIds = trueEventIds; } @@ -91,4 +91,4 @@ public class ActionTransitionCriteria implements TransitionCriteria { } return false; } -} +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionCriteriaChain.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionCriteriaChain.java index c2ae1536..90e85712 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionCriteriaChain.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionCriteriaChain.java @@ -49,7 +49,7 @@ public class TransitionCriteriaChain implements TransitionCriteria { * Creates a transition criteria chain with the specified criteria. * @param criteria the criteria */ - public TransitionCriteriaChain(TransitionCriteria[] criteria) { + public TransitionCriteriaChain(TransitionCriteria... criteria) { criteriaChain.addAll(Arrays.asList(criteria)); } @@ -82,7 +82,7 @@ public class TransitionCriteriaChain implements TransitionCriteria { * Create a transition criteria chain chaining given list of actions. * @param actions the actions (and their execution properties) to chain together */ - public static TransitionCriteria criteriaChainFor(Action[] actions) { + public static TransitionCriteria criteriaChainFor(Action... actions) { if (actions == null || actions.length == 0) { return WildcardTransitionCriteria.INSTANCE; } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java index 755dbc06..202517d8 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java @@ -64,7 +64,7 @@ public class FlowExecutionListenerCriteriaFactory { * Returns a criteria that just matches a flow if it is identified by one of the specified ids. * @param flowIds the flow ids to match */ - public FlowExecutionListenerCriteria flows(String[] flowIds) { + public FlowExecutionListenerCriteria flows(String... flowIds) { return new FlowIdFlowExecutionListenerCriteria(flowIds); } @@ -96,7 +96,7 @@ public class FlowExecutionListenerCriteriaFactory { * Create a new flow id matching flow execution listener criteria implementation. * @param flowIds the flow ids to match */ - public FlowIdFlowExecutionListenerCriteria(String[] flowIds) { + public FlowIdFlowExecutionListenerCriteria(String... flowIds) { Assert.notEmpty(flowIds, "The flow id array is required"); this.flowIds = flowIds; } @@ -114,4 +114,4 @@ public class FlowExecutionListenerCriteriaFactory { return new ToStringCreator(this).append("flowIds", StylerUtils.style(flowIds)).toString(); } } -} +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java index 6ba5478f..75521430 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008 the original author or authors. + * Copyright 2004-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ public final class StaticFlowExecutionListenerLoader implements FlowExecutionLis * should not attempt to modify the passed in array as no deep copy is made. * @param listeners the listener array. */ - public StaticFlowExecutionListenerLoader(FlowExecutionListener[] listeners) { + public StaticFlowExecutionListenerLoader(FlowExecutionListener... listeners) { Assert.notNull(listeners, "The flow execution listener array is required"); this.listeners = listeners; } @@ -67,4 +67,4 @@ public final class StaticFlowExecutionListenerLoader implements FlowExecutionLis public FlowExecutionListener[] getListeners(FlowDefinition flowDefinition) { return listeners; } -} \ No newline at end of file +}