Repository: tapestry-5 Updated Branches: refs/heads/master 92a92fb68 -> b83b38c9a
TAP5-1813: the methods returned by java.lang.Class.getMethods() are not guaranteed to be returned in a particular order Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b83b38c9 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b83b38c9 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b83b38c9 Branch: refs/heads/master Commit: b83b38c9ad5018a402c5de91795b329197a892cb Parents: 92a92fb Author: Jochen Kemnade <[email protected]> Authored: Wed Sep 16 11:57:13 2015 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Wed Sep 16 11:57:13 2015 +0200 ---------------------------------------------------------------------- .../tapestry5/ioc/internal/services/StrategyBuilderImpl.java | 4 ++-- .../src/test/groovy/ioc/specs/StrategyBuilderImplSpec.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b83b38c9/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java index d443c70..116d24f 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java @@ -78,8 +78,8 @@ public class StrategyBuilderImpl implements StrategyBuilder interfaceSelectorType = methodSelectorType; } else if (!interfaceSelectorType.equals(methodSelectorType)) { - throw new IllegalArgumentException("Conflicting method definition " + method - + ", expecting a parameter of type " + interfaceSelectorType + " as the first argument"); + throw new IllegalArgumentException("Conflicting method definitions," + + " expecting the first argument of every method to have the same type"); } plasticClass.introduceMethod(new MethodDescription(method), new InstructionBuilderCallback() http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b83b38c9/tapestry-ioc/src/test/groovy/ioc/specs/StrategyBuilderImplSpec.groovy ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/StrategyBuilderImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/StrategyBuilderImplSpec.groovy index 5294061..754a76a 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/StrategyBuilderImplSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/StrategyBuilderImplSpec.groovy @@ -89,7 +89,7 @@ class StrategyBuilderImplSpec extends AbstractSharedRegistrySpecification { Provider2 provider2 = builder.build Provider2, [:] then: IllegalArgumentException e2 = thrown() - e2.message.contains 'expecting a parameter of type class java.lang.String as the first argument' + e2.message.contains 'expecting the first argument of every method to have the same type' }
