Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 0A6F510616 for ; Tue, 19 May 2015 17:55:24 +0000 (UTC) Received: (qmail 35131 invoked by uid 500); 19 May 2015 17:55:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35099 invoked by uid 500); 19 May 2015 17:55:23 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 35088 invoked by uid 99); 19 May 2015 17:55:23 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2015 17:55:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 7D240182929 for ; Tue, 19 May 2015 17:55:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id dd_jlAiOxHno for ; Tue, 19 May 2015 17:55:17 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id DD8AD453D8 for ; Tue, 19 May 2015 17:55:16 +0000 (UTC) Received: (qmail 34942 invoked by uid 99); 19 May 2015 17:55:16 -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; Tue, 19 May 2015 17:55:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45906E2F6E; Tue, 19 May 2015 17:55:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 19 May 2015 17:55:17 -0000 Message-Id: <5ef22407ede34003ae2fc2e2984ef6f9@git.apache.org> In-Reply-To: <91a945560ebb40ac8193e9dbd37858aa@git.apache.org> References: <91a945560ebb40ac8193e9dbd37858aa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/50] [abbrv] incubator-ignite git commit: # IGNITE-894 Code cleanup. # IGNITE-894 Code cleanup. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96ad5a86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96ad5a86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96ad5a86 Branch: refs/heads/ignite-648 Commit: 96ad5a8605b54e02057253ad7d330f2726ddd687 Parents: f027ac5 Author: sevdokimov Authored: Tue May 12 18:39:37 2015 +0300 Committer: sevdokimov Committed: Tue May 12 18:39:37 2015 +0300 ---------------------------------------------------------------------- .../processors/resource/GridResourceField.java | 5 +---- .../processors/resource/GridResourceIoc.java | 18 ++++++++++-------- .../apache/ignite/internal/util/IgniteUtils.java | 3 +++ 3 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96ad5a86/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java index 162de1c..fed7ebd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java @@ -44,10 +44,7 @@ class GridResourceField { * @param field Field where resource should be injected. * @param ann Resource annotation. */ - GridResourceField(Field field, @Nullable Annotation ann) { - assert field != null; - assert ann != null || GridResourceUtils.mayRequireResources(field); - + GridResourceField(@NotNull Field field, @NotNull Annotation ann) { this.field = field; this.ann = ann; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96ad5a86/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java index c2ef116..3d853d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; import org.jsr166.*; @@ -142,9 +143,9 @@ class GridResourceIoc { boolean injected = false; - for (GridResourceField field : descr.recursiveFields()) { + for (Field field : descr.recursiveFields()) { try { - Object obj = field.getField().get(target); + Object obj = field.get(target); if (obj != null) { assert checkedObjs != null; @@ -153,7 +154,7 @@ class GridResourceIoc { } } catch (IllegalAccessException e) { - throw new IgniteCheckedException("Failed to inject resource [field=" + field.getField().getName() + + throw new IgniteCheckedException("Failed to inject resource [field=" + field.getName() + ", target=" + target + ']', e); } } @@ -253,7 +254,7 @@ class GridResourceIoc { */ private static class ClassDescriptor { /** */ - private final GridResourceField[] recursiveFields; + private final Field[] recursiveFields; /** */ private final Map, T2> annMap; @@ -265,7 +266,7 @@ class GridResourceIoc { Map, T2, List>> annMap = new HashMap<>(); - Collection recursiveFieldsList = new ArrayList<>(); + List recursiveFieldsList = new ArrayList<>(); boolean allowImplicitInjection = !GridNoImplicitInjection.class.isAssignableFrom(cls); @@ -291,7 +292,7 @@ class GridResourceIoc { && fieldAnns.length == 0 && GridResourceUtils.mayRequireResources(field)) { // Account for anonymous inner classes. - recursiveFieldsList.add(new GridResourceField(field, null)); + recursiveFieldsList.add(field); } } @@ -312,7 +313,8 @@ class GridResourceIoc { } } - recursiveFields = GridResourceField.toArray(recursiveFieldsList); + recursiveFields = recursiveFieldsList.isEmpty() ? U.EMPTY_FIELDS + : recursiveFieldsList.toArray(new Field[recursiveFieldsList.size()]); this.annMap = IgniteUtils.limitedMap(annMap.size()); @@ -328,7 +330,7 @@ class GridResourceIoc { /** * @return Recursive fields. */ - public GridResourceField[] recursiveFields() { + public Field[] recursiveFields() { return recursiveFields; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96ad5a86/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index ffb4e99..673287d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -113,6 +113,9 @@ public abstract class IgniteUtils { /** Empty longs. */ public static final long[] EMPTY_LONGS = new long[0]; + /** Empty longs. */ + public static final Field[] EMPTY_FIELDS = new Field[0]; + /** System line separator. */ private static final String NL = System.getProperty("line.separator");