Return-Path: X-Original-To: apmail-tapestry-commits-archive@minotaur.apache.org Delivered-To: apmail-tapestry-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E22917CB2 for ; Wed, 16 Sep 2015 09:58:56 +0000 (UTC) Received: (qmail 9322 invoked by uid 500); 16 Sep 2015 09:58:43 -0000 Delivered-To: apmail-tapestry-commits-archive@tapestry.apache.org Received: (qmail 9285 invoked by uid 500); 16 Sep 2015 09:58:43 -0000 Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tapestry.apache.org Delivered-To: mailing list commits@tapestry.apache.org Received: (qmail 9272 invoked by uid 99); 16 Sep 2015 09:58:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Sep 2015 09:58:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7416DE0522; Wed, 16 Sep 2015 09:58:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jkemnade@apache.org To: commits@tapestry.apache.org Message-Id: <0c9df6ca52f94a9c80086c3880b9f136@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tapestry-5 git commit: TAP5-1813: the methods returned by java.lang.Class.getMethods() are not guaranteed to be returned in a particular order Date: Wed, 16 Sep 2015 09:58:43 +0000 (UTC) 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 Authored: Wed Sep 16 11:57:13 2015 +0200 Committer: Jochen Kemnade 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' }