polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [08/14] zest-java git commit: minor: remove dead commented code and unused imports
Date Mon, 28 Nov 2016 16:07:53 GMT
minor: remove dead commented code and unused imports


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/611ef1bd
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/611ef1bd
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/611ef1bd

Branch: refs/heads/develop
Commit: 611ef1bd5706a9f07d20173727d78f7d39de8b7b
Parents: 88117d1
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon Nov 28 10:40:44 2016 +0100
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon Nov 28 10:49:30 2016 +0100

----------------------------------------------------------------------
 .../api/query/grammar/ExpressionPredicate.java  | 30 --------
 .../api/service/importer/InstanceImporter.java  | 15 ----
 .../api/service/importer/NewObjectImporter.java |  1 -
 .../importer/ServiceSelectorImporter.java       |  1 -
 .../org/apache/zest/api/util/Annotations.java   |  3 +-
 .../java/org/apache/zest/api/util/Classes.java  | 76 --------------------
 .../org/apache/zest/api/util/Constructors.java  |  2 -
 .../java/org/apache/zest/api/util/Fields.java   |  3 -
 .../bootstrap/CompositeAssemblyImpl.java        | 17 -----
 .../composite/AbstractModifierModel.java        |  1 -
 .../zest/runtime/composite/ConcernsModel.java   |  3 -
 .../zest/runtime/composite/MixinModel.java      |  1 -
 .../zest/runtime/composite/MixinsModel.java     | 17 -----
 .../runtime/composite/SideEffectsModel.java     |  1 -
 .../runtime/injection/InjectedMethodsModel.java |  1 -
 .../zest/runtime/legacy/Specifications.java     |  1 -
 .../zest/runtime/property/PropertyModel.java    |  3 -
 .../zest/runtime/service/ServiceModel.java      | 34 ---------
 18 files changed, 1 insertion(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/query/grammar/ExpressionPredicate.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/query/grammar/ExpressionPredicate.java
b/core/api/src/main/java/org/apache/zest/api/query/grammar/ExpressionPredicate.java
index 8e85c91..4fca55d 100644
--- a/core/api/src/main/java/org/apache/zest/api/query/grammar/ExpressionPredicate.java
+++ b/core/api/src/main/java/org/apache/zest/api/query/grammar/ExpressionPredicate.java
@@ -22,40 +22,10 @@ package org.apache.zest.api.query.grammar;
 import java.util.function.Predicate;
 import org.apache.zest.api.composite.Composite;
 
-import static org.apache.zest.functional.Iterables.append;
-import static org.apache.zest.functional.Iterables.iterable;
-
 /**
  * Base expression Specification.
  */
 public abstract class ExpressionPredicate
     implements Predicate<Composite>
 {
-
-//    @SuppressWarnings( "unchecked" )
-//    public AndPredicate and( Predicate<Composite> specification )
-//    {
-//        if( this instanceof AndPredicate )
-//        {
-//            return new AndPredicate( append( specification, ( (AndPredicate) this ).operands()
) );
-//        }
-//        else
-//        {
-//            return new AndPredicate( iterable( this, specification ) );
-//        }
-//    }
-//
-//    @SuppressWarnings( "unchecked" )
-//    public OrPredicate or( Predicate<Composite> specification )
-//    {
-//        if( this instanceof OrPredicate )
-//        {
-//            return new OrPredicate( append( specification, ( (OrPredicate) this ).operands()
) );
-//        }
-//        else
-//        {
-//            return new OrPredicate( iterable( this, specification ) );
-//        }
-//    }
-//
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/service/importer/InstanceImporter.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/service/importer/InstanceImporter.java
b/core/api/src/main/java/org/apache/zest/api/service/importer/InstanceImporter.java
index b996b0b..add1636 100644
--- a/core/api/src/main/java/org/apache/zest/api/service/importer/InstanceImporter.java
+++ b/core/api/src/main/java/org/apache/zest/api/service/importer/InstanceImporter.java
@@ -53,21 +53,6 @@ public final class InstanceImporter<T>
             .flatMap( holder -> serviceDescriptor.types().map( type -> (T) holder.metaInfo(
type ) ) )
             .filter( meta -> meta != null )
             .findFirst().orElse( null );
-
-//        T instance = null;
-//        Iterable<MetaInfoHolder> holders = Iterables.iterable( serviceDescriptor,
module, layer, application );
-//        for( final MetaInfoHolder metaInfoHolder : holders )
-//        {
-//            Function<Class<?>, T> metaFinder = type -> (T) metaInfoHolder.metaInfo(
type );
-//
-//
-//            instance = first( filter( notNull(), map( metaFinder, serviceDescriptor.types()
) ) );
-//            if( instance != null )
-//            {
-//                break;
-//            }
-//        }
-//        return instance;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/service/importer/NewObjectImporter.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/service/importer/NewObjectImporter.java
b/core/api/src/main/java/org/apache/zest/api/service/importer/NewObjectImporter.java
index 359f3f8..0098dc4 100644
--- a/core/api/src/main/java/org/apache/zest/api/service/importer/NewObjectImporter.java
+++ b/core/api/src/main/java/org/apache/zest/api/service/importer/NewObjectImporter.java
@@ -25,7 +25,6 @@ import org.apache.zest.api.object.ObjectFactory;
 import org.apache.zest.api.service.ImportedServiceDescriptor;
 import org.apache.zest.api.service.ServiceImporter;
 import org.apache.zest.api.service.ServiceImporterException;
-import org.apache.zest.functional.Iterables;
 
 /**
  * Import Services using a new registered Object instance.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/service/importer/ServiceSelectorImporter.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/service/importer/ServiceSelectorImporter.java
b/core/api/src/main/java/org/apache/zest/api/service/importer/ServiceSelectorImporter.java
index 5f5c776..30ad631 100644
--- a/core/api/src/main/java/org/apache/zest/api/service/importer/ServiceSelectorImporter.java
+++ b/core/api/src/main/java/org/apache/zest/api/service/importer/ServiceSelectorImporter.java
@@ -31,7 +31,6 @@ import org.apache.zest.api.service.ServiceImporter;
 import org.apache.zest.api.service.ServiceImporterException;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.service.qualifier.ServiceQualifier;
-import org.apache.zest.functional.Iterables;
 
 /**
  * If several services are available with a given type, and you want to constrain

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/util/Annotations.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/util/Annotations.java b/core/api/src/main/java/org/apache/zest/api/util/Annotations.java
index 2f09b89..838f7e8 100644
--- a/core/api/src/main/java/org/apache/zest/api/util/Annotations.java
+++ b/core/api/src/main/java/org/apache/zest/api/util/Annotations.java
@@ -40,9 +40,8 @@ import static org.apache.zest.api.util.Classes.typeOf;
  */
 public final class Annotations
 {
-    public static Function<Type, Stream<Annotation>> ANNOTATIONS_OF =
+    public static final Function<Type, Stream<Annotation>> ANNOTATIONS_OF =
         Classes.forTypes( type -> Arrays.stream( Classes.RAW_CLASS.apply( type ).getAnnotations()
) );
-//        Classes.forTypes( type -> Iterables.iterable( Classes.RAW_CLASS.apply( type
).getAnnotations() ) );
 
     public static Predicate<AnnotatedElement> hasAnnotation( final Class<? extends
Annotation> annotationType )
     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/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 f0366b2..7611389 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
@@ -179,21 +179,8 @@ public final class Classes
                 }
                 else
                 {
-//                    Stream<Type> stream1 = Arrays.stream( clazz.getGenericInterfaces()
).flatMap( INTERFACES_OF );
-//                    Stream<Type> stream2 = Stream.of( type )
-//                        .map( RAW_CLASS )
-//                        .map( Class::getSuperclass )
-//                        .map( RAW_CLASS );
-//                    return concat( stream1, stream2 );
-
                     return concat( Stream.of( clazz.getGenericInterfaces() ).flatMap( INTERFACES_OF
),
                                    Stream.of( clazz.getSuperclass() ).flatMap( INTERFACES_OF
) );
-//                    return flatten(
-//                        flattenIterables(
-//                            map( INTERFACES_OF, iterable( clazz.getGenericInterfaces()
) )
-//                        ),
-//                        INTERFACES_OF.apply( RAW_CLASS.apply( type ).getSuperclass() )
-//                    );
 
                 }
             }
@@ -378,19 +365,6 @@ public final class Classes
             .map( clazz -> clazz.getAnnotation( annotationClass ) )
             .filter( annot -> annot != null )
             .findAny().get();
-//
-//
-//        AnnotationType result = null;
-//        for( Type clazz : Classes.TYPES_OF.apply( type ) )
-//        {
-//            result = Classes.RAW_CLASS.apply( clazz ).getAnnotation( annotationClass );
-//            if( result != null )
-//            {
-//                break;
-//            }
-//        }
-//
-//        return result;
     }
 
     public static Predicate<Member> memberNamed( final String name )
@@ -466,56 +440,6 @@ public final class Classes
             .map( subClass -> resolveTypeVariable( name, declaringClass, mappings, subClass
) )
             .filter( type -> type != null )
             .findAny().orElse( null );
-
-//        List<Type> types = new ArrayList<>();
-//        for( Type type : current.getGenericInterfaces() )
-//        {
-//            Iterable<Type> interfaces = Classes.INTERFACES_OF.apply( type );
-//            for( Type anInterface : interfaces )
-//            {
-//                if( !types.contains( anInterface ) )
-//                {
-//                    types.add( anInterface );
-//                }
-//            }
-//            types.add( type );
-//        }
-//
-//        if( current.getGenericSuperclass() != null )
-//        {
-//            types.add( current.getGenericSuperclass() );
-//        }
-//
-//        for( Type type : types )
-//        {
-//            Class subClass;
-//            if( type instanceof ParameterizedType )
-//            {
-//                ParameterizedType pt = (ParameterizedType) type;
-//                Type[] args = pt.getActualTypeArguments();
-//                Class clazz = (Class) pt.getRawType();
-//                TypeVariable[] vars = clazz.getTypeParameters();
-//                for( int i = 0; i < vars.length; i++ )
-//                {
-//                    TypeVariable var = vars[ i ];
-//                    Type mappedType = args[ i ];
-//                    mappings.put( var, mappedType );
-//                }
-//                subClass = (Class) pt.getRawType();
-//            }
-//            else
-//            {
-//                subClass = (Class) type;
-//            }
-//
-//            Type resolvedType = resolveTypeVariable( name, declaringClass, mappings, subClass
);
-//            if( resolvedType != null )
-//            {
-//                return resolvedType;
-//            }
-//        }
-//
-//        return null;
     }
 
     private static Class extractTypeVariables( Map<TypeVariable, Type> mappings, ParameterizedType
type )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/util/Constructors.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/util/Constructors.java b/core/api/src/main/java/org/apache/zest/api/util/Constructors.java
index e7ce713..f26ee4c 100644
--- a/core/api/src/main/java/org/apache/zest/api/util/Constructors.java
+++ b/core/api/src/main/java/org/apache/zest/api/util/Constructors.java
@@ -25,8 +25,6 @@ import java.util.Arrays;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import static org.apache.zest.functional.Iterables.iterable;
-
 /**
  * Useful methods for handling Constructors.
  */

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/api/src/main/java/org/apache/zest/api/util/Fields.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/util/Fields.java b/core/api/src/main/java/org/apache/zest/api/util/Fields.java
index 69ca022..a5a6a53 100644
--- a/core/api/src/main/java/org/apache/zest/api/util/Fields.java
+++ b/core/api/src/main/java/org/apache/zest/api/util/Fields.java
@@ -25,9 +25,6 @@ import java.util.Arrays;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import org.apache.zest.functional.Iterables;
-
-import static org.apache.zest.functional.Iterables.iterable;
 
 /**
  * Useful methods for handling Fields.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
index b3788bd..1d0ff01 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
@@ -265,23 +265,6 @@ public abstract class CompositeAssemblyImpl
                                 .equals( clazz ) ) )
                         .forEach( thisDependencies::add );
 
-//                    // Implement @This references
-//                    Iterable<Class<?>> map = map( new DependencyModel.InjectionTypeFunction(),
-//                                                  filter( new DependencyModel.ScopeSpecification(
This.class ),
-//                                                          methodComposite.dependencies()
) );
-
-//                    Iterable<Class<?>> map1 = map( new DependencyModel.InjectionTypeFunction(),
-//                                                   filter( new DependencyModel.ScopeSpecification(
This.class ),
-//                                                           mixinModel.dependencies() )
);
-
-//                    @SuppressWarnings( "unchecked" )
-//                    Iterable<Class<?>> filter = filter(
-//                        not( in( Initializable.class, Lifecycle.class, InvocationHandler.class
) ),
-//                        map( Classes.RAW_CLASS, interfacesOf( mixinModel.mixinClass() )
)
-//                    );
-//                    Iterable<? extends Class<?>> flatten = flatten( map, map1,
filter );
-//                    addAll( thisDependencies, flatten );
-
                     compositeMethodsModel.addMethod( methodComposite );
                 }
             }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/composite/AbstractModifierModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/AbstractModifierModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/composite/AbstractModifierModel.java
index af8d069..0d7f8b5 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/AbstractModifierModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/AbstractModifierModel.java
@@ -77,7 +77,6 @@ public abstract class AbstractModifierModel
     {
         Stream<? extends Dependencies> models = Stream.of( this.constructorsModel,
injectedFieldsModel, injectedMethodsModel );
         return models.flatMap( Dependencies::dependencies );
-//        return flattenIterables( map( DEPENDENCIES_FUNCTION, iterable( constructorsModel,
injectedFieldsModel, injectedMethodsModel ) ) );
     }
 
     public boolean isGeneric()

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConcernsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConcernsModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConcernsModel.java
index da420ae..a1c6b2b 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConcernsModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/ConcernsModel.java
@@ -28,11 +28,9 @@ import java.util.stream.Stream;
 import org.apache.zest.api.concern.ConcernsDescriptor;
 import org.apache.zest.api.structure.ModuleDescriptor;
 import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.functional.VisitableHierarchy;
 import org.apache.zest.runtime.injection.Dependencies;
 import org.apache.zest.runtime.injection.DependencyModel;
-import org.apache.zest.spi.module.ModuleSpi;
 
 /**
  * JAVADOC
@@ -53,7 +51,6 @@ public final class ConcernsModel
     public Stream<DependencyModel> dependencies()
     {
         return concernsFor.stream().flatMap( ConcernModel::dependencies );
-//        return Iterables.flattenIterables( Iterables.map( Dependencies.DEPENDENCIES_FUNCTION,
concernsFor ) );
     }
 
     // Context

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinModel.java
index e470dca..9ce738b 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinModel.java
@@ -161,7 +161,6 @@ public final class MixinModel
             .distinct()
             .map( new DependencyModel.InjectionTypeFunction() )
             .collect( Collectors.toList() );
-//        return map( new DependencyModel.InjectionTypeFunction(), unique( Iterables.filter(
new DependencyModel.ScopeSpecification( This.class ), dependencies() ) ) );
     }
 
     protected FragmentInvocationHandler newInvocationHandler( Method method )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinsModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinsModel.java
index a34fecc..721794f 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinsModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/MixinsModel.java
@@ -206,23 +206,6 @@ public class MixinsModel
         return methodImplementation.entrySet()
             .stream().filter( entry -> entry.getValue().mixinClass().equals( mixinClass
) )
             .map( Map.Entry::getKey );
-
-//        return map( new Function<Map.Entry<Method, MixinModel>, Method>()
-//        {
-//            @Override
-//            public Method apply( Map.Entry<Method, MixinModel> entry )
-//            {
-//                return entry.getKey();
-//            }
-//        }, filter( new Predicate<Map.Entry<Method, MixinModel>>()
-//        {
-//            @Override
-//            public boolean test( Map.Entry<Method, MixinModel> item )
-//            {
-//                MixinModel model = item.getValue();
-//                return model.mixinClass().equals( mixinClass );
-//            }
-//        }, methodImplementation.entrySet() ) );
     }
 
     private class Uses

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/composite/SideEffectsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/SideEffectsModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/composite/SideEffectsModel.java
index 0c8e9a3..0e0db3f 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/SideEffectsModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/SideEffectsModel.java
@@ -52,7 +52,6 @@ public final class SideEffectsModel
     public Stream<DependencyModel> dependencies()
     {
         return sideEffectModels.stream().flatMap( Dependencies::dependencies );
-//        return Iterables.flattenIterables( Iterables.map( Dependencies.DEPENDENCIES_FUNCTION,
sideEffectModels ) );
     }
 
     // Context

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedMethodsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedMethodsModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedMethodsModel.java
index 1f5589a..4615c0c 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedMethodsModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedMethodsModel.java
@@ -109,7 +109,6 @@ public final class InjectedMethodsModel
     public Stream<DependencyModel> dependencies()
     {
         return methodModels.stream().flatMap( InjectedMethodModel::dependencies );
-//        return flattenIterables( map( Dependencies.DEPENDENCIES_FUNCTION, methodModels
) );
     }
 
     // Context

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/legacy/Specifications.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/legacy/Specifications.java
b/core/runtime/src/main/java/org/apache/zest/runtime/legacy/Specifications.java
index d7c0356..ac2491e 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/legacy/Specifications.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/legacy/Specifications.java
@@ -19,7 +19,6 @@
  */
 package org.apache.zest.runtime.legacy;
 
-import java.util.Arrays;
 import java.util.function.Function;
 import java.util.function.Predicate;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/property/PropertyModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/property/PropertyModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/property/PropertyModel.java
index 807194f..d854bb3 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/property/PropertyModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/property/PropertyModel.java
@@ -54,9 +54,6 @@ import org.apache.zest.runtime.model.Binder;
 import org.apache.zest.runtime.model.Resolution;
 import org.apache.zest.runtime.types.ValueTypeFactory;
 
-//import static org.apache.zest.functional.Iterables.empty;
-//import static org.apache.zest.functional.Iterables.first;
-
 /**
  * Model for a Property.
  *

http://git-wip-us.apache.org/repos/asf/zest-java/blob/611ef1bd/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
index a5c0f14..5e9e1c0 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
@@ -191,39 +191,5 @@ public final class ServiceModel extends CompositeModel
                 }
                 return injectionClass;
             } );
-
-//        Class injectionClass = null;
-//        Iterable<DependencyModel> configurationThisDependencies =
-//            filter(
-//                and(
-//                    translate( new DependencyModel.InjectionTypeFunction(),
-//                               Specifications.<Class<?>>in( Configuration.class
)
-//                    ),
-//                    new DependencyModel.ScopeSpecification( This.class ) ),
-//                dependencies()
-//            );
-//        for( DependencyModel dependencyModel : configurationThisDependencies )
-//
-//        {
-//            if( dependencyModel.rawInjectionType()
-//                    .equals( Configuration.class ) && dependencyModel.injectionType()
instanceof ParameterizedType )
-//            {
-//                Class<?> type = Classes.RAW_CLASS
-//                    .apply( ( (ParameterizedType) dependencyModel.injectionType() ).getActualTypeArguments()[
0 ] );
-//                if( injectionClass == null )
-//                {
-//                    injectionClass = type;
-//                }
-//                else
-//                {
-//                    if( injectionClass.isAssignableFrom( type ) )
-//                    {
-//                        injectionClass = type;
-//                    }
-//                }
-//            }
-//        }
-//
-//        return injectionClass;
     }
 }


Mime
View raw message