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 6F8A818245 for ; Mon, 16 Nov 2015 16:08:40 +0000 (UTC) Received: (qmail 91330 invoked by uid 500); 16 Nov 2015 16:08:40 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 91307 invoked by uid 500); 16 Nov 2015 16:08:40 -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 91298 invoked by uid 99); 16 Nov 2015 16:08:40 -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; Mon, 16 Nov 2015 16:08:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 147E9E0615; Mon, 16 Nov 2015 16:08:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Mon, 16 Nov 2015 16:08:39 -0000 Message-Id: <1d93404b8d7b47aeb78cb9d643368673@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] zest-java git commit: Minor edits (unnecessary/missing generics, dead code...) around @This injection Repository: zest-java Updated Branches: refs/heads/develop 73b7f1969 -> 3c6c11f4d Minor edits (unnecessary/missing generics, dead code...) around @This injection Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/f871f7a8 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/f871f7a8 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/f871f7a8 Branch: refs/heads/develop Commit: f871f7a8e2077145894438fe27424c1dcd2eaece Parents: 73b7f19 Author: Paul Merlin Authored: Mon Nov 16 16:05:45 2015 +0100 Committer: Paul Merlin Committed: Mon Nov 16 16:05:45 2015 +0100 ---------------------------------------------------------------------- .../runtime/composite/ConstructorsModel.java | 31 +++++++------------- .../injection/InjectedParametersModel.java | 16 ---------- 2 files changed, 10 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/f871f7a8/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConstructorsModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConstructorsModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConstructorsModel.java index 435a020..faf0754 100644 --- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConstructorsModel.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConstructorsModel.java @@ -56,24 +56,24 @@ public final class ConstructorsModel implements Binder, Dependencies, VisitableHierarchy { @SuppressWarnings( "raw" ) - private final Class fragmentClass; + private final Class fragmentClass; private final List constructorModels; private List boundConstructors; @SuppressWarnings( { "raw", "unchecked" } ) - public ConstructorsModel( Class fragmentClass ) + public ConstructorsModel( Class fragmentClass ) { this.fragmentClass = fragmentClass; validate( fragmentClass ); constructorModels = new ArrayList<>(); - Constructor[] realConstructors = this.fragmentClass.getDeclaredConstructors(); - Class injectionClass = FragmentClassLoader.getSourceClass( fragmentClass ); - for( Constructor constructor : realConstructors ) + Constructor[] realConstructors = this.fragmentClass.getDeclaredConstructors(); + Class injectionClass = FragmentClassLoader.getSourceClass( fragmentClass ); + for( Constructor constructor : realConstructors ) { constructor.setAccessible( true ); try { - Constructor injectionConstructor = injectionClass.getDeclaredConstructor( constructor.getParameterTypes() ); + Constructor injectionConstructor = injectionClass.getDeclaredConstructor( constructor.getParameterTypes() ); injectionConstructor.setAccessible( true ); ConstructorModel constructorModel = newConstructorModel( this.fragmentClass, constructor, injectionConstructor ); @@ -91,7 +91,7 @@ public final class ConstructorsModel } @SuppressWarnings( "raw" ) - private void validate( Class fragmentClass ) + private void validate( Class fragmentClass ) { // Ensure that the fragment class is not an inner class, in which case we should give a reasonable exception if( fragmentClass.getDeclaringClass() == null ) @@ -113,23 +113,12 @@ public final class ConstructorsModel return constructorModels.stream().flatMap( ConstructorModel::dependencies ); } return boundConstructors.stream().flatMap( ConstructorModel::dependencies ); - -// Function> constructorDependencies = new Function>() -// { -// @Override -// public Iterable apply( ConstructorModel constructorModel ) -// { -// return constructorModel.dependencies(); -// } -// }; -// -// return Iterables.flattenIterables( Iterables.map( constructorDependencies, boundConstructors == null ? constructorModels : boundConstructors ) ); } @SuppressWarnings( "raw" ) - private ConstructorModel newConstructorModel( Class fragmentClass, - Constructor realConstructor, - Constructor injectedConstructor + private ConstructorModel newConstructorModel( Class fragmentClass, + Constructor realConstructor, + Constructor injectedConstructor ) { int idx = 0; http://git-wip-us.apache.org/repos/asf/zest-java/blob/f871f7a8/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedParametersModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedParametersModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedParametersModel.java index db1665c..4fdd2a8 100644 --- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedParametersModel.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedParametersModel.java @@ -15,14 +15,11 @@ package org.apache.zest.runtime.injection; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import java.util.function.Predicate; import java.util.stream.Stream; import org.apache.zest.api.composite.InjectedParametersDescriptor; import org.apache.zest.functional.HierarchicalVisitor; import org.apache.zest.functional.VisitableHierarchy; -import org.apache.zest.runtime.composite.ConstructorModel; /** * JAVADOC @@ -81,19 +78,6 @@ public final class InjectedParametersModel return visitor.visitLeave( this ); } - public Collection filter( Predicate specification ) - { - ArrayList result = new ArrayList(); - for( DependencyModel model : parameterDependencies ) - { - if( specification.test( model ) ) - { - result.add( model ); - } - } - return result; - } - @Override public String toString() {