Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-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 C854718385 for ; Thu, 27 Aug 2015 01:11:54 +0000 (UTC) Received: (qmail 61571 invoked by uid 500); 27 Aug 2015 01:11:54 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 61551 invoked by uid 500); 27 Aug 2015 01:11:54 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 61542 invoked by uid 99); 27 Aug 2015 01:11:54 -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; Thu, 27 Aug 2015 01:11:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94473E7140; Thu, 27 Aug 2015 01:11:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@zest.apache.org Message-Id: <2a20f615288143ca963f78a221903163@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zest-java git commit: ZEST-118; Fixed that Classes.typesOf() also returns the inparameter. Date: Thu, 27 Aug 2015 01:11:54 +0000 (UTC) Repository: zest-java Updated Branches: refs/heads/develop 987eb0e60 -> 198fd4a81 ZEST-118; Fixed that Classes.typesOf() also returns the inparameter. Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/198fd4a8 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/198fd4a8 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/198fd4a8 Branch: refs/heads/develop Commit: 198fd4a813050491f6d21b8270755ab3aa8bd61b Parents: 987eb0e Author: Niclas Hedhman Authored: Thu Aug 27 09:11:40 2015 +0800 Committer: Niclas Hedhman Committed: Thu Aug 27 09:11:40 2015 +0800 ---------------------------------------------------------------------- core/api/src/main/java/org/apache/zest/api/util/Classes.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/198fd4a8/core/api/src/main/java/org/apache/zest/api/util/Classes.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/zest/api/util/Classes.java b/core/api/src/main/java/org/apache/zest/api/util/Classes.java index 7bc6f67..19180cb 100644 --- a/core/api/src/main/java/org/apache/zest/api/util/Classes.java +++ b/core/api/src/main/java/org/apache/zest/api/util/Classes.java @@ -196,7 +196,8 @@ public final class Classes } else { - return Stream.of(type).flatMap( CLASS_HIERARCHY ).flatMap( INTERFACES_OF ).flatMap( CLASS_HIERARCHY ); + return concat( Stream.of( clazz ), + Stream.of( type ).flatMap( CLASS_HIERARCHY ).flatMap( INTERFACES_OF )); } };