You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/11/28 16:07:46 UTC

[01/14] zest-java git commit: build: upgrade Gradle to 3.2.1

Repository: zest-java
Updated Branches:
  refs/heads/develop a7d76c630 -> d313c1329


build: upgrade Gradle to 3.2.1

Use the -all distribution to get completion, documentation and sources
in the IDE. It\u2019s a +~20MB download, but worth it.


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

Branch: refs/heads/develop
Commit: 927d444928cef604bfa4323de7330d0fd567b74b
Parents: a7d76c6
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 27 10:34:05 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 27 10:34:05 2016 +0100

----------------------------------------------------------------------
 gradle/wrapper/gradle-wrapper.jar        | Bin 52980 -> 54227 bytes
 gradle/wrapper/gradle-wrapper.properties |   6 ++----
 gradlew                                  |  22 +++++++++++++++-------
 gradlew.bat                              |   6 ------
 4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/927d4449/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index dbc7430..51288f9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/zest-java/blob/927d4449/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 14f1690..3739dc7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -15,12 +15,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-#
-#
 
-#Mon Jul 06 10:43:59 EEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
+

http://git-wip-us.apache.org/repos/asf/zest-java/blob/927d4449/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 27309d9..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

http://git-wip-us.apache.org/repos/asf/zest-java/blob/927d4449/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line


[09/14] zest-java git commit: classscanner: prever Streams over Iterables

Posted by pa...@apache.org.
classscanner: prever Streams over Iterables


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

Branch: refs/heads/develop
Commit: 3acd801d4a51ca16a0db4b91531842db81261633
Parents: 611ef1b
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 11:12:55 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 11:28:41 2016 +0100

----------------------------------------------------------------------
 .../org/apache/zest/bootstrap/ClassScanner.java | 160 +++++++------------
 .../apache/zest/bootstrap/ClassScannerTest.java |  14 +-
 .../builder/ApplicationBuilderTest.java         |  12 +-
 .../runtime/query/IterableQuerySourceTest.java  |   8 +-
 .../library/rest/common/ValueAssembler.java     |  12 +-
 .../server/assembler/RestServerAssembler.java   |  32 ++--
 6 files changed, 98 insertions(+), 140 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/3acd801d/core/bootstrap/src/main/java/org/apache/zest/bootstrap/ClassScanner.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/ClassScanner.java b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/ClassScanner.java
index 7b8cd6b..c792048 100644
--- a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/ClassScanner.java
+++ b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/ClassScanner.java
@@ -25,47 +25,46 @@ import java.lang.reflect.Modifier;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.CodeSource;
+import java.util.Collections;
+import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
-import org.apache.zest.functional.Iterables;
-
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.flatten;
-import static org.apache.zest.functional.Iterables.flattenIterables;
-import static org.apache.zest.functional.Iterables.iterable;
-import static org.apache.zest.functional.Iterables.map;
+import java.util.stream.Stream;
 
 /**
  * Scan classpath for classes that matches given criteria. Useful for automated assemblies with lots of similar classes.
  */
 public class ClassScanner
 {
+    private static final ValidClass VALID_CLASS_PREDICATE = new ValidClass();
+
     /**
      * Get all classes from the same package of the given class, and recursively in all subpackages.
      * <p>
      * This only works if the seed class is loaded from a file: URL. Jar files are possible as well. Abstract classes
-     * are not included in the results. For further filtering use e.g. Iterables.filter.
+     * are not included in the results. For further filtering use e.g. Stream.filter.
      * </p>
      * @param seedClass starting point for classpath scanning
      *
-     * @return iterable of all concrete classes in the same package as the seedclass, and also all classes in subpackages.
+     * @return Stream of all concrete classes in the same package as the seedclass, and also all classes in subpackages.
      */
-    public static Iterable<Class<?>> findClasses( final Class<?> seedClass )
+    public static Stream<? extends Class<?>> findClasses( final Class<?> seedClass )
     {
         CodeSource codeSource = seedClass.getProtectionDomain().getCodeSource();
         if( codeSource == null )
         {
-            return Iterables.empty();
+            return Stream.of();
         }
 
         URL location = codeSource.getLocation();
 
         if( !location.getProtocol().equals( "file" ) )
         {
-            throw new IllegalArgumentException( "Can only enumerate classes from file system locations. URL is:" + location );
+            throw new IllegalArgumentException(
+                "Can only enumerate classes from file system locations. URL is:" + location );
         }
 
         final File file;
@@ -75,7 +74,8 @@ public class ClassScanner
         }
         catch( URISyntaxException e )
         {
-            throw new IllegalArgumentException( "The file location of codebase is invalid. Can not convert to URI. URL is:" + location );
+            throw new IllegalArgumentException(
+                "The file location of codebase is invalid. Can not convert to URI. URL is:" + location );
         }
 
         if( file.getName().endsWith( ".jar" ) )
@@ -85,38 +85,27 @@ public class ClassScanner
                 final String packageName = seedClass.getPackage().getName().replace( '.', '/' );
 
                 JarFile jarFile = new JarFile( file );
-                Iterable<JarEntry> entries = Iterables.iterable( jarFile.entries() );
+                List<JarEntry> entries = Collections.list( jarFile.entries() );
                 try
                 {
-                    return Iterables.toList( filter( new ValidClass(),
-                                                     map( new Function<JarEntry, Class<?>>()
-                                                     {
-                                                         @Override
-                                                         public Class apply( JarEntry jarEntry )
-                                                         {
-                                                             String name = jarEntry.getName();
-                                                             name = name.substring( 0, name.length() - 6 );
-                                                             name = name.replace( '/', '.' );
-                                                             try
-                                                             {
-                                                                 return seedClass.getClassLoader().loadClass( name );
-                                                             }
-                                                             catch( ClassNotFoundException e )
-                                                             {
-                                                                 return null;
-                                                             }
-                                                         }
-                                                     }
-                                                         , filter( new Predicate<JarEntry>()
-                                                     {
-                                                         @Override
-                                                         public boolean test( JarEntry jarEntry )
-                                                         {
-                                                             return jarEntry.getName()
-                                                                        .startsWith( packageName ) && jarEntry.getName()
-                                                                 .endsWith( ".class" );
-                                                         }
-                                                     }, entries ) ) ) );
+                    return entries.stream()
+                                  .filter( jarEntry -> jarEntry.getName().startsWith( packageName )
+                                                       && jarEntry.getName().endsWith( ".class" ) )
+                                  .map( jarEntry ->
+                                        {
+                                            String name = jarEntry.getName();
+                                            name = name.substring( 0, name.length() - 6 );
+                                            name = name.replace( '/', '.' );
+                                            try
+                                            {
+                                                return seedClass.getClassLoader().loadClass( name );
+                                            }
+                                            catch( ClassNotFoundException e )
+                                            {
+                                                return null;
+                                            }
+                                        } )
+                                  .filter( VALID_CLASS_PREDICATE );
                 }
                 finally
                 {
@@ -131,34 +120,22 @@ public class ClassScanner
         else
         {
             final File path = new File( file, seedClass.getPackage().getName().replace( '.', File.separatorChar ) );
-            Iterable<File> files = findFiles( path, new Predicate<File>()
-            {
-                @Override
-                public boolean test( File file )
-                {
-                    return file.getName().endsWith( ".class" );
-                }
-            } );
-
-            return filter( new ValidClass(),
-                           map( new Function<File, Class<?>>()
-                           {
-                               @Override
-                               public Class<?> apply( File f )
-                               {
-                                   String fileName = f.getAbsolutePath().substring( file.toString().length() + 1 );
-                                   fileName = fileName.replace( File.separatorChar, '.' )
-                                       .substring( 0, fileName.length() - 6 );
-                                   try
-                                   {
-                                       return seedClass.getClassLoader().loadClass( fileName );
-                                   }
-                                   catch( ClassNotFoundException e )
-                                   {
-                                       return null;
-                                   }
-                               }
-                           }, files ) );
+            Stream<File> classFiles = findFiles( path, candidate -> candidate.getName().endsWith( ".class" ) );
+            return classFiles
+                .map( classFile ->
+                      {
+                          String fileName = classFile.getAbsolutePath().substring( file.toString().length() + 1 );
+                          fileName = fileName.replace( File.separatorChar, '.' ).substring( 0, fileName.length() - 6 );
+                          try
+                          {
+                              return seedClass.getClassLoader().loadClass( fileName );
+                          }
+                          catch( ClassNotFoundException e )
+                          {
+                              return null;
+                          }
+                      } )
+                .filter( VALID_CLASS_PREDICATE );
         }
     }
 
@@ -175,35 +152,21 @@ public class ClassScanner
     public static Predicate<Class<?>> matches( String regex )
     {
         final Pattern pattern = Pattern.compile( regex );
-
-        return new Predicate<Class<?>>()
-        {
-            @Override
-            public boolean test( Class<?> aClass )
-            {
-                return pattern.matcher( aClass.getName() ).matches();
-            }
-        };
+        return aClass -> pattern.matcher( aClass.getName() ).matches();
     }
 
-    private static Iterable<File> findFiles( File directory, final Predicate<File> filter )
+    private static Stream<File> findFiles( File directory, final Predicate<File> filter )
     {
-        return flatten( filter( filter, iterable( directory.listFiles() ) ),
-                        flattenIterables( map( new Function<File, Iterable<File>>()
-                        {
-                            @Override
-                            public Iterable<File> apply( File file )
-                            {
-                                return findFiles( file, filter );
-                            }
-                        }, filter( new Predicate<File>()
-                        {
-                            @Override
-                            public boolean test( File file )
-                            {
-                                return file.isDirectory();
-                            }
-                        }, iterable( directory.listFiles() ) ) ) ) );
+        File[] listedFiles = directory.listFiles();
+        if( listedFiles == null )
+        {
+            return Stream.of();
+        }
+        return Stream.concat( Stream.of( listedFiles ).filter( filter ),
+                              Stream.of( listedFiles )
+                                    .filter( File::isDirectory )
+                                    .map( dir -> findFiles( dir, filter ) )
+                                    .flatMap( Function.identity() ) );
     }
 
     private static class ValidClass
@@ -212,7 +175,8 @@ public class ClassScanner
         @Override
         public boolean test( Class<?> item )
         {
-            return ( item.isInterface() || !Modifier.isAbstract( item.getModifiers() ) ) && ( !item.isEnum() && !item.isAnonymousClass() );
+            return ( item.isInterface() || !Modifier.isAbstract( item.getModifiers() ) )
+                   && ( !item.isEnum() && !item.isAnonymousClass() );
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/3acd801d/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java b/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java
index 0a9932b..bb38ff5 100644
--- a/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java
+++ b/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java
@@ -19,16 +19,14 @@
  */
 package org.apache.zest.bootstrap;
 
+import org.apache.zest.api.activation.ActivationException;
+import org.apache.zest.bootstrap.somepackage.Test2Value;
 import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler;
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.zest.api.activation.ActivationException;
-import org.apache.zest.bootstrap.somepackage.Test2Value;
-import org.apache.zest.functional.Iterables;
 
 import static org.apache.zest.bootstrap.ClassScanner.findClasses;
 import static org.apache.zest.bootstrap.ClassScanner.matches;
-import static org.apache.zest.functional.Iterables.filter;
 
 /**
  * Test and showcase of the ClassScanner assembly utility.
@@ -48,10 +46,8 @@ public class ClassScannerTest
                 new DefaultUnitOfWorkAssembler().assemble( module );
 
                 // Find all classes starting from TestValue, but include only the ones that are named *Value
-                for( Class aClass : filter( matches( ".*Value" ), findClasses( TestValue.class ) ) )
-                {
-                    module.values( aClass );
-                }
+                findClasses( TestValue.class ).filter( matches( ".*Value" ) )
+                                              .forEach( module::values );
             }
         };
 
@@ -62,6 +58,6 @@ public class ClassScannerTest
     @Test
     public void testClassScannerJar()
     {
-        Assert.assertEquals( 185, Iterables.count( findClasses( Test.class ) ) );
+        Assert.assertEquals( 185, findClasses( Test.class ).count() );
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/3acd801d/core/bootstrap/src/test/java/org/apache/zest/bootstrap/builder/ApplicationBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/test/java/org/apache/zest/bootstrap/builder/ApplicationBuilderTest.java b/core/bootstrap/src/test/java/org/apache/zest/bootstrap/builder/ApplicationBuilderTest.java
index fea47d4..a07d92a 100644
--- a/core/bootstrap/src/test/java/org/apache/zest/bootstrap/builder/ApplicationBuilderTest.java
+++ b/core/bootstrap/src/test/java/org/apache/zest/bootstrap/builder/ApplicationBuilderTest.java
@@ -22,8 +22,6 @@ package org.apache.zest.bootstrap.builder;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import org.json.JSONException;
-import org.junit.Test;
 import org.apache.zest.api.activation.ActivationException;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.structure.Application;
@@ -31,12 +29,15 @@ import org.apache.zest.api.structure.Module;
 import org.apache.zest.bootstrap.Assembler;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
+import org.json.JSONException;
+import org.junit.Test;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static java.util.stream.Collectors.toList;
 import static org.apache.zest.bootstrap.ClassScanner.findClasses;
 import static org.apache.zest.bootstrap.ClassScanner.matches;
 import static org.apache.zest.functional.Iterables.filter;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
 
 public class ApplicationBuilderTest
 {
@@ -48,7 +49,8 @@ public class ApplicationBuilderTest
         builder.withLayer( "layer1" ).using( "layer2" ).using( "layer3" );
         builder.withLayer( "layer2" );
         builder.withLayer( "layer3" ).withModule( "test module" ).
-            withAssemblers( filter( matches( ".*ServiceAssembler" ), findClasses( getClass() ) ) );
+            withAssemblers( filter( matches( ".*ServiceAssembler" ),
+                                    findClasses( getClass() ).collect( toList() ) ) );
         Application application = builder.newApplication();
         Module module = application.findModule( "layer3", "test module" );
         TestService service = module.findService( TestService.class ).get();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/3acd801d/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
index 2b35c48..d36e659 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
@@ -81,15 +81,11 @@ public class IterableQuerySourceTest
     {
         SingletonAssembler assembler = new SingletonAssembler()
         {
+            @Override
             public void assemble( ModuleAssembly module )
                 throws AssemblyException
             {
-                Iterable<Class<?>> entities = ClassScanner.findClasses( DomainEntity.class );
-
-                for( Class entity : entities )
-                {
-                    module.entities( entity );
-                }
+                ClassScanner.findClasses( DomainEntity.class ).forEach( module::entities );
 
                 module.values( ContactsValue.class, ContactValue.class );
                 new EntityTestAssembler().assemble( module );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/3acd801d/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/ValueAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/ValueAssembler.java b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/ValueAssembler.java
index f8a301e..8cebeba 100644
--- a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/ValueAssembler.java
+++ b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/ValueAssembler.java
@@ -26,9 +26,8 @@ import org.apache.zest.bootstrap.Assembler;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 
-import static org.apache.zest.api.util.Classes.*;
-import static org.apache.zest.bootstrap.ClassScanner.*;
-import static org.apache.zest.functional.Iterables.*;
+import static org.apache.zest.api.util.Classes.isAssignableFrom;
+import static org.apache.zest.bootstrap.ClassScanner.findClasses;
 
 /**
  * Assembler for all REST values.
@@ -40,9 +39,8 @@ public class ValueAssembler
     public void assemble( ModuleAssembly module )
         throws AssemblyException
     {
-        for( Class<?> aClass : filter( isAssignableFrom( ValueComposite.class ), findClasses( Resource.class ) ))
-        {
-            module.values( aClass ).visibleIn( Visibility.application );
-        }
+        findClasses( Resource.class ).filter( isAssignableFrom( ValueComposite.class ) )
+                                     .forEach( resourceType -> module.values( resourceType )
+                                                                     .visibleIn( Visibility.application ) );
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/3acd801d/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/assembler/RestServerAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/assembler/RestServerAssembler.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/assembler/RestServerAssembler.java
index a9ee8ac..d51c8d5 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/assembler/RestServerAssembler.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/assembler/RestServerAssembler.java
@@ -23,6 +23,7 @@ package org.apache.zest.library.rest.server.assembler;
 import freemarker.template.Configuration;
 import freemarker.template.Version;
 import java.lang.reflect.Modifier;
+import java.util.List;
 import java.util.Properties;
 import java.util.function.Predicate;
 import org.apache.velocity.app.VelocityEngine;
@@ -42,11 +43,11 @@ import org.apache.zest.library.rest.server.restlet.responsewriter.DefaultRespons
 import org.apache.zest.library.rest.server.spi.ResponseWriter;
 import org.restlet.service.MetadataService;
 
+import static java.util.stream.Collectors.toList;
 import static org.apache.zest.api.util.Classes.hasModifier;
 import static org.apache.zest.api.util.Classes.isAssignableFrom;
 import static org.apache.zest.bootstrap.ImportedServiceDeclaration.INSTANCE;
 import static org.apache.zest.bootstrap.ImportedServiceDeclaration.NEW_OBJECT;
-import static org.apache.zest.functional.Iterables.filter;
 
 /**
  * JAVADOC
@@ -66,7 +67,7 @@ public class RestServerAssembler
             VelocityEngine velocity = new VelocityEngine( props );
 
             module.importedServices( VelocityEngine.class )
-                .importedBy( INSTANCE ).setMetaInfo( velocity );
+                  .importedBy( INSTANCE ).setMetaInfo( velocity );
         }
         catch( Exception e )
         {
@@ -83,28 +84,29 @@ public class RestServerAssembler
         module.importedServices( MetadataService.class );
 
         module.importedServices( ResponseWriterDelegator.class )
-            .identifiedBy( "responsewriterdelegator" )
-            .importedBy( NEW_OBJECT )
-            .visibleIn( Visibility.layer );
+              .identifiedBy( "responsewriterdelegator" )
+              .importedBy( NEW_OBJECT )
+              .visibleIn( Visibility.layer );
         module.objects( ResponseWriterDelegator.class );
 
         module.importedServices( RequestReaderDelegator.class )
-            .identifiedBy( "requestreaderdelegator" )
-            .importedBy( NEW_OBJECT )
-            .visibleIn( Visibility.layer );
+              .identifiedBy( "requestreaderdelegator" )
+              .importedBy( NEW_OBJECT )
+              .visibleIn( Visibility.layer );
         module.objects( RequestReaderDelegator.class );
 
-        module.importedServices( InteractionConstraintsService.class ).
-            importedBy( NewObjectImporter.class ).
-            visibleIn( Visibility.application );
+        module.importedServices( InteractionConstraintsService.class )
+              .importedBy( NewObjectImporter.class )
+              .visibleIn( Visibility.application );
         module.objects( InteractionConstraintsService.class );
 
         // Standard response writers
-        Iterable<Class<?>> writers = ClassScanner.findClasses( DefaultResponseWriter.class );
-        Predicate<Class<?>> responseWriterClass = isAssignableFrom( ResponseWriter.class );
+        Predicate<Class<?>> isResponseWriterClass = isAssignableFrom( ResponseWriter.class );
         Predicate<Class<?>> isNotAnAbstract = hasModifier( Modifier.ABSTRACT ).negate();
-        Iterable<Class<?>> candidates = filter( isNotAnAbstract.and( responseWriterClass ), writers );
-        for( Class<?> responseWriter : candidates )
+        List<? extends Class<?>> responseWriters = ClassScanner.findClasses( DefaultResponseWriter.class )
+                                                               .filter( isNotAnAbstract.and( isResponseWriterClass ) )
+                                                               .collect( toList() );
+        for( Class<?> responseWriter : responseWriters )
         {
             module.objects( responseWriter );
         }


[11/14] zest-java git commit: prefer streams over core/functional globally - first pass

Posted by pa...@apache.org.
prefer streams over core/functional globally - first pass


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

Branch: refs/heads/develop
Commit: fdf596b92f4162579fc275094e26b1ff4ec4bedf
Parents: c7fe187
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 12:04:48 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 12:46:38 2016 +0100

----------------------------------------------------------------------
 .../api/service/importer/InstanceImporter.java  |  3 +-
 .../org/apache/zest/api/type/ValueType.java     |  9 ++---
 .../api/unitofwork/NoSuchEntityException.java   |  7 ----
 .../java/org/apache/zest/api/util/Classes.java  | 35 ++++--------------
 .../runtime/activation/ActivatorsInstance.java  | 22 +++++++++---
 .../bootstrap/CompositeAssemblyImpl.java        | 27 ++++++--------
 .../runtime/bootstrap/ModuleAssemblyImpl.java   |  6 ++--
 .../runtime/bootstrap/ServiceAssemblyImpl.java  | 19 +++++-----
 .../zest/runtime/composite/CompositeModel.java  | 11 +++---
 .../runtime/composite/ConstructorsModel.java    | 14 ++++----
 .../zest/runtime/composite/MixinsModel.java     |  4 ---
 .../zest/runtime/composite/UsesInstance.java    |  3 +-
 .../zest/runtime/injection/DependencyModel.java | 13 +++----
 .../ServiceInjectionProviderFactory.java        | 12 +++----
 .../provider/ThisInjectionProviderFactory.java  |  3 +-
 .../zest/runtime/query/IterableQuerySource.java | 14 +++++---
 .../service/ImportedServicesInstance.java       |  8 ++---
 .../zest/runtime/service/ServicesInstance.java  |  8 ++---
 .../zest/runtime/structure/TypeLookupImpl.java  |  6 ++--
 .../structure/CompositeDescriptorTest.java      |  3 +-
 .../spi/value/ValueDeserializerAdapter.java     |  4 +--
 .../helpers/JSONManyAssociationStateTest.java   | 19 ++++------
 .../test/indexing/AbstractEntityFinderTest.java | 37 ++++++++++----------
 .../support/skeletons/AbstractSQLStartup.java   |  8 ++---
 .../zest/library/http/AbstractJettyMixin.java   | 11 +++---
 .../org/apache/zest/library/jmx/ZestMBeans.java | 19 +++-------
 .../rest/server/api/ContextResource.java        |  8 ++---
 .../requestreader/DefaultRequestReader.java     | 14 +++-----
 .../responsewriter/ResourceResponseWriter.java  |  5 ++-
 29 files changed, 150 insertions(+), 202 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/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 add1636..a6ed355 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
@@ -20,6 +20,7 @@
 
 package org.apache.zest.api.service.importer;
 
+import java.util.Objects;
 import java.util.stream.Stream;
 import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.service.ImportedServiceDescriptor;
@@ -51,7 +52,7 @@ public final class InstanceImporter<T>
     {
         return Stream.of( serviceDescriptor, module, layer, application )
             .flatMap( holder -> serviceDescriptor.types().map( type -> (T) holder.metaInfo( type ) ) )
-            .filter( meta -> meta != null )
+            .filter( Objects::nonNull )
             .findFirst().orElse( null );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/api/src/main/java/org/apache/zest/api/type/ValueType.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/type/ValueType.java b/core/api/src/main/java/org/apache/zest/api/type/ValueType.java
index ed95068..3795d67 100644
--- a/core/api/src/main/java/org/apache/zest/api/type/ValueType.java
+++ b/core/api/src/main/java/org/apache/zest/api/type/ValueType.java
@@ -19,16 +19,13 @@
  */
 package org.apache.zest.api.type;
 
-import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.Stream;
 import org.apache.zest.api.identity.Identity;
 import org.apache.zest.api.util.NullArgumentException;
-import org.apache.zest.functional.Iterables;
 
-import static org.apache.zest.functional.Iterables.first;
+import static java.util.stream.Collectors.joining;
 
 /**
  * Base class for types of values in ValueComposites and Properties.
@@ -135,7 +132,7 @@ public class ValueType
 
     public Class<?> mainType()
     {
-        return first( types );
+        return types.stream().findFirst().orElse( null );
     }
 
     @Override
@@ -147,7 +144,7 @@ public class ValueType
     @Override
     public String toString()
     {
-        String name = Iterables.toString( types, Class::getName, "," );
+        String name = types.stream().map( Class::getName ).collect( joining( "," ) );
         if( name.contains( "," ) )
         {
             name = "{" + name + "}";

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/api/src/main/java/org/apache/zest/api/unitofwork/NoSuchEntityException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/unitofwork/NoSuchEntityException.java b/core/api/src/main/java/org/apache/zest/api/unitofwork/NoSuchEntityException.java
index 689b053..9827a2e 100644
--- a/core/api/src/main/java/org/apache/zest/api/unitofwork/NoSuchEntityException.java
+++ b/core/api/src/main/java/org/apache/zest/api/unitofwork/NoSuchEntityException.java
@@ -22,7 +22,6 @@ package org.apache.zest.api.unitofwork;
 import java.util.stream.Stream;
 import org.apache.zest.api.entity.EntityReference;
 import org.apache.zest.api.usecase.Usecase;
-import org.apache.zest.functional.Iterables;
 
 import static java.util.Arrays.stream;
 
@@ -73,12 +72,6 @@ public class NoSuchEntityException
         return usecase;
     }
 
-    private static Class<?>[] castToArray( Iterable<Class<?>> iterableClasses )
-    {
-        Iterable<Class> types = Iterables.cast( iterableClasses );
-        return Iterables.toArray( Class.class, types );
-    }
-
     private static String toString( Class<?>[] mixinTypes )
     {
         String reduced = stream( mixinTypes ).map( Class::getName ).reduce( "", ( ret, name ) -> ret + "," + name );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/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 7611389..ed215e7 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
@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -242,29 +243,14 @@ public final class Classes
         return clazz::isAssignableFrom;
     }
 
-    @SuppressWarnings( "raw" )
-    public static Predicate<Object> instanceOf( final Class clazz )
+    public static Predicate<Object> instanceOf( final Class<?> clazz )
     {
-        return new Predicate<Object>()
-        {
-            @Override
-            public boolean test( Object item )
-            {
-                return clazz.isInstance( item );
-            }
-        };
+        return clazz::isInstance;
     }
 
     public static Predicate<Class<?>> hasModifier( final int classModifier )
     {
-        return new Predicate<Class<?>>()
-        {
-            @Override
-            public boolean test( Class<?> item )
-            {
-                return ( item.getModifiers() & classModifier ) != 0;
-            }
-        };
+        return item -> ( item.getModifiers() & classModifier ) != 0;
     }
 
     public static <T> Function<Type, Stream<T>> forClassHierarchy( final Function<Class<?>, Stream<T>> function )
@@ -363,20 +349,13 @@ public final class Classes
             .flatMap( TYPES_OF )
             .map( RAW_CLASS )
             .map( clazz -> clazz.getAnnotation( annotationClass ) )
-            .filter( annot -> annot != null )
-            .findAny().get();
+            .filter( Objects::nonNull )
+            .findAny().orElse( null );
     }
 
     public static Predicate<Member> memberNamed( final String name )
     {
-        return new Predicate<Member>()
-        {
-            @Override
-            public boolean test( Member item )
-            {
-                return item.getName().equals( name );
-            }
-        };
+        return item -> item.getName().equals( name );
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/activation/ActivatorsInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/activation/ActivatorsInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/activation/ActivatorsInstance.java
index 8ddd3e3..e682fba 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/activation/ActivatorsInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/activation/ActivatorsInstance.java
@@ -20,11 +20,15 @@
 package org.apache.zest.runtime.activation;
 
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.Set;
+import java.util.stream.StreamSupport;
 import org.apache.zest.api.activation.Activator;
 import org.apache.zest.api.activation.PassivationException;
-import org.apache.zest.functional.Iterables;
+
+import static java.util.stream.Collectors.toCollection;
 
 /**
  * Instance of a Zest Activators of one Activation target. Contains ordered
@@ -35,7 +39,7 @@ import org.apache.zest.functional.Iterables;
 public class ActivatorsInstance<ActivateeType>
     implements Activator<ActivateeType>
 {
-    @SuppressWarnings( {"raw", "unchecked"} )
+    @SuppressWarnings( { "raw", "unchecked" } )
     public static final ActivatorsInstance EMPTY = new ActivatorsInstance( Collections.emptyList() );
 
     private final Iterable<Activator<ActivateeType>> activators;
@@ -70,8 +74,10 @@ public class ActivatorsInstance<ActivateeType>
         throws Exception
     {
         Set<Exception> exceptions = new LinkedHashSet<>();
-        for( Activator<ActivateeType> activator : Iterables.reverse( activators ) )
+        Iterator<Activator<ActivateeType>> iterator = reverseActivatorsIterator();
+        while( iterator.hasNext() )
         {
+            Activator<ActivateeType> activator = iterator.next();
             try
             {
                 activator.beforePassivation( passivating );
@@ -92,8 +98,10 @@ public class ActivatorsInstance<ActivateeType>
         throws Exception
     {
         Set<Exception> exceptions = new LinkedHashSet<>();
-        for( Activator<ActivateeType> activator : Iterables.reverse( activators ) )
+        Iterator<Activator<ActivateeType>> iterator = reverseActivatorsIterator();
+        while( iterator.hasNext() )
         {
+            Activator<ActivateeType> activator = iterator.next();
             try
             {
                 activator.afterPassivation( passivated );
@@ -109,4 +117,10 @@ public class ActivatorsInstance<ActivateeType>
         }
     }
 
+    private Iterator<Activator<ActivateeType>> reverseActivatorsIterator()
+    {
+        return StreamSupport.stream( activators.spliterator(), false )
+                            .collect( toCollection( LinkedList::new ) )
+                            .descendingIterator();
+    }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/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 1d0ff01..6f4bbbf 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
@@ -106,9 +106,6 @@ import static org.apache.zest.api.util.Classes.isAssignableFrom;
 import static org.apache.zest.api.util.Classes.typeOf;
 import static org.apache.zest.api.util.Classes.typesOf;
 import static org.apache.zest.api.util.Classes.wrapperClass;
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.first;
-import static org.apache.zest.functional.Iterables.iterable;
 import static org.apache.zest.runtime.legacy.Specifications.translate;
 
 /**
@@ -312,7 +309,7 @@ public abstract class CompositeAssemblyImpl
         }
 
         // Check generic implementations
-        mixinClass = findGenericImplementation( method, mixinDeclarations );
+        mixinClass = findGenericImplementation( method, mixinDeclarations.stream() );
         if( mixinClass != null )
         {
             return implementMethodWithClass( method, mixinClass );
@@ -322,26 +319,22 @@ public abstract class CompositeAssemblyImpl
                                              + "\nin\n    " + types );
     }
 
-    @SuppressWarnings( { "raw", "unchecked" } )
     private Class<?> findTypedImplementation( final Method method, Stream<Class<?>> mixins )
     {
         // Check if mixinClass implements the method. If so, check if the mixinClass is generic or if the filter passes.
         // If a mixinClass is both generic AND non-generic at the same time, then the filter applies to the non-generic
         // side only.
         Predicate<Class<?>> appliesToSpec = item -> helper.appliesTo( item, method, types, item );
-        return mixins
-            .filter( isAssignableFrom( method.getDeclaringClass() )
-                         .and( Genericpredicate.INSTANCE
-                                   .or( appliesToSpec ) ) )
-            .findFirst().orElse( null );
+        return mixins.filter( isAssignableFrom( method.getDeclaringClass() )
+                                  .and( Genericpredicate.INSTANCE.or( appliesToSpec ) ) )
+                     .findFirst().orElse( null );
     }
 
-    @SuppressWarnings( "unchecked" )
-    private Class<?> findGenericImplementation( final Method method, Iterable<Class<?>> mixins )
+    private Class<?> findGenericImplementation( final Method method, Stream<Class<?>> mixins )
     {
         // Check if mixinClass is generic and the applies-to filter passes
-        return first( filter( Genericpredicate.INSTANCE
-                                  .and( item -> helper.appliesTo( item, method, types, item ) ), mixins ) );
+        Predicate<Class<?>> appliesToSpec = item -> helper.appliesTo( item, method, types, item );
+        return mixins.filter( Genericpredicate.INSTANCE.and( appliesToSpec ) ).findFirst().orElse( null );
     }
 
     private MixinModel implementMethodWithClass( Method method, Class mixinClass )
@@ -500,10 +493,12 @@ public abstract class CompositeAssemblyImpl
         {
             Annotation[] parameterAnnotation = parameterAnnotations[ i ];
 
-            Name nameAnnotation = (Name) first( filter( isType( Name.class ), iterable( parameterAnnotation ) ) );
+            Name nameAnnotation = (Name) Stream.of( parameterAnnotation ).filter( isType( Name.class ) )
+                                               .findFirst().orElse( null );
             String name = nameAnnotation == null ? "param" + ( i + 1 ) : nameAnnotation.value();
 
-            boolean optional = first( filter( isType( Optional.class ), iterable( parameterAnnotation ) ) ) != null;
+            boolean optional = Stream.of( parameterAnnotation ).filter( isType( Optional.class ) )
+                                     .findFirst().isPresent();
             ValueConstraintsModel parameterConstraintsModel = constraintsFor(
                 Arrays.stream( parameterAnnotation ),
                 parameterTypes[ i ],

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ModuleAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ModuleAssemblyImpl.java b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ModuleAssemblyImpl.java
index 10e1b21..1dea286 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ModuleAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ModuleAssemblyImpl.java
@@ -72,7 +72,6 @@ import org.apache.zest.bootstrap.ValueAssembly;
 import org.apache.zest.bootstrap.ValueDeclaration;
 import org.apache.zest.bootstrap.identity.DefaultIdentityGeneratorAssembler;
 import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.runtime.activation.ActivatorsModel;
 import org.apache.zest.runtime.composite.TransientModel;
 import org.apache.zest.runtime.composite.TransientsModel;
@@ -392,9 +391,10 @@ final class ModuleAssemblyImpl
 
         for (Class<?> serviceType : serviceTypes)
         {
-            if (Iterables.matchesAny(AssemblySpecifications.ofAnyType(serviceType), serviceAssemblies))
+            if( serviceAssemblies.stream().anyMatch( AssemblySpecifications.ofAnyType( serviceType ) ) )
             {
-                Iterables.addAll(assemblies, Iterables.filter(AssemblySpecifications.ofAnyType(serviceType), serviceAssemblies));
+                serviceAssemblies.stream().filter( AssemblySpecifications.ofAnyType( serviceType ) )
+                                 .forEach( assemblies::add );
             }
             else
             {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ServiceAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ServiceAssemblyImpl.java b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ServiceAssemblyImpl.java
index 268a819..5d5b2e8 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ServiceAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/ServiceAssemblyImpl.java
@@ -34,11 +34,7 @@ import org.apache.zest.api.util.Annotations;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.ServiceAssembly;
 import org.apache.zest.bootstrap.StateDeclarations;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.runtime.activation.ActivatorsModel;
-import org.apache.zest.runtime.association.AssociationsModel;
-import org.apache.zest.runtime.association.ManyAssociationsModel;
-import org.apache.zest.runtime.association.NamedAssociationsModel;
 import org.apache.zest.runtime.service.ServiceModel;
 import org.apache.zest.runtime.structure.ModuleModel;
 
@@ -74,8 +70,9 @@ public final class ServiceAssemblyImpl extends CompositeAssemblyImpl
         try
         {
             buildComposite( helper, stateDeclarations );
-            List<Class<? extends Activator<?>>> activatorClasses = Iterables.toList(
-                Iterables.<Class<? extends Activator<?>>>flatten( activators, activatorsDeclarations( types.stream() ) ) );
+            List<Class<? extends Activator<?>>> activatorClasses = Stream
+                .concat( activators.stream(), activatorsDeclarations( types ) )
+                .collect( Collectors.toList() );
             return new ServiceModel( module, types, visibility, metaInfo,
                                      new ActivatorsModel( activatorClasses ),
                                      mixinsModel, stateModel, compositeMethodsModel,
@@ -87,12 +84,12 @@ public final class ServiceAssemblyImpl extends CompositeAssemblyImpl
         }
     }
 
-    private Iterable<Class<? extends Activator<?>>> activatorsDeclarations( Stream<? extends Class<?>> typess )
+    private Stream<Class<? extends Activator<?>>> activatorsDeclarations( List<? extends Class<?>> types )
     {
-        return typess.flatMap( Classes::typesOf )
-//            .filter( type -> Annotations.annotationOn( type, Activators.class ) == null )
-            .flatMap( this::getAnnotations )
-            .collect( Collectors.toList() );
+        return types.stream()
+                    .flatMap( Classes::typesOf )
+                    //.filter( type -> Annotations.annotationOn( type, Activators.class ) == null )
+                    .flatMap( this::getAnnotations );
     }
 
     private Stream<? extends Class<? extends Activator<?>>> getAnnotations( Type type )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java
index c872ff7..eb9ddb7 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/CompositeModel.java
@@ -35,14 +35,11 @@ import org.apache.zest.api.composite.CompositeDescriptor;
 import org.apache.zest.api.composite.InvalidCompositeException;
 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 static java.lang.reflect.Proxy.newProxyInstance;
-import static org.apache.zest.functional.Iterables.first;
-import static org.apache.zest.functional.Iterables.toList;
 
 /**
  * JAVADOC
@@ -177,12 +174,12 @@ public abstract class CompositeModel
     @SuppressWarnings( { "raw", "unchecked" } )
     private void createProxyClass()
     {
-        Class<?> mainType = first( types );
+        Class<?> mainType = types.stream().findFirst().get();
         if( mainType.isInterface() )
         {
             ClassLoader proxyClassloader = mainType.getClassLoader();
 
-            Class<?>[] interfaces = Iterables.toArray( Class.class, Iterables.<Class>cast( types ) );
+            Class<?>[] interfaces = types.stream().map( Class.class::cast ).toArray( Class[]::new );
             proxyClass = (Class<? extends Composite>) ProxyGenerator.createProxyClass( proxyClassloader, interfaces );
 
             try
@@ -229,7 +226,7 @@ public abstract class CompositeModel
     public Composite newProxy( InvocationHandler invocationHandler )
         throws ConstructionException
     {
-        Class<?> mainType = first( types );
+        Class<?> mainType = types.stream().findFirst().get();
         if( mainType.isInterface() )
         {
             try
@@ -276,6 +273,6 @@ public abstract class CompositeModel
     @Override
     public String toString()
     {
-        return toList( types ).toString();
+        return types.toString();
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/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 3ea8642..5608027 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
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 import org.apache.zest.api.common.ConstructionException;
 import org.apache.zest.api.composite.CompositeDescriptor;
@@ -41,20 +42,16 @@ import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.BindingException;
 import org.apache.zest.functional.HierarchicalVisitor;
 import org.apache.zest.functional.HierarchicalVisitorAdapter;
-import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.functional.VisitableHierarchy;
 import org.apache.zest.runtime.injection.Dependencies;
 import org.apache.zest.runtime.injection.DependencyModel;
 import org.apache.zest.runtime.injection.InjectedParametersModel;
 import org.apache.zest.runtime.injection.InjectionContext;
 import org.apache.zest.runtime.injection.ParameterizedTypeInstance;
+import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.runtime.model.Binder;
 import org.apache.zest.runtime.model.Resolution;
 
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.first;
-import static org.apache.zest.functional.Iterables.iterable;
-
 /**
  * JAVADOC
  */
@@ -132,8 +129,11 @@ public final class ConstructorsModel
         Annotation[][] parameterAnnotations = injectedConstructor.getParameterAnnotations();
         for( Type type : injectedConstructor.getGenericParameterTypes() )
         {
-            Annotation injectionAnnotation = first(
-                filter( Specifications.translate( Annotations.type(), Annotations.hasAnnotation( InjectionScope.class ) ), iterable( parameterAnnotations[ idx ] ) ) );
+            Predicate<Annotation> injectionAnnotationSpec = Specifications.translate(
+                Annotations.type(), Annotations.hasAnnotation( InjectionScope.class ) );
+            Annotation injectionAnnotation = Stream.of( parameterAnnotations[ idx ] )
+                                                   .filter( injectionAnnotationSpec )
+                                                   .findFirst().orElse( null );
 
             if( injectionAnnotation == null )
             {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/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 721794f..d3564c1 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
@@ -30,8 +30,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.BindingException;
@@ -45,8 +43,6 @@ import org.apache.zest.runtime.model.Binder;
 import org.apache.zest.runtime.model.Resolution;
 
 import static org.apache.zest.api.util.Classes.interfacesOf;
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.map;
 
 /**
  * Base implementation of model for mixins. This records the mapping between methods in the Composite

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/composite/UsesInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/composite/UsesInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/composite/UsesInstance.java
index abf21f8..af0ff09 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/composite/UsesInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/composite/UsesInstance.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import org.apache.zest.functional.Iterables;
 
 /**
  * JAVADOC
@@ -79,7 +78,7 @@ public final class UsesInstance
 
     public Object[] toArray()
     {
-        return Iterables.toArray( uses );
+        return uses.toArray();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
index 8a48f0b..23c5659 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
@@ -25,14 +25,15 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 import org.apache.zest.api.common.ConstructionException;
 import org.apache.zest.api.common.Optional;
 import org.apache.zest.api.composite.DependencyDescriptor;
 import org.apache.zest.bootstrap.BindingException;
 import org.apache.zest.bootstrap.InvalidInjectionException;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.functional.Visitable;
 import org.apache.zest.functional.Visitor;
 import org.apache.zest.runtime.injection.provider.CachingInjectionProviderDecorator;
@@ -42,7 +43,6 @@ import org.apache.zest.runtime.model.Binder;
 import org.apache.zest.runtime.model.Resolution;
 
 import static org.apache.zest.api.util.Annotations.isType;
-import static org.apache.zest.functional.Iterables.iterable;
 
 /**
  * JAVADOC
@@ -53,7 +53,7 @@ public final class DependencyModel
 {
     public static boolean isOptional( Annotation injectionAnnotation, Annotation[] annotations )
     {
-        if( Iterables.matchesAny( isType( Optional.class ), iterable( annotations ) ) )
+        if( Stream.of( annotations ).anyMatch( isType( Optional.class ) ) )
         {
             return true;
         }
@@ -335,14 +335,15 @@ public final class DependencyModel
 
         if( injectionResult instanceof Iterable )
         {
-            if( Iterable.class.isAssignableFrom( rawInjectionClass ) || rawInjectionClass.isInstance(
-                injectionResult ) )
+            if( Iterable.class.isAssignableFrom( rawInjectionClass )
+                || rawInjectionClass.isInstance( injectionResult ) )
             {
                 return injectionResult;
             }
             else
             {
-                return Iterables.first( (Iterable) injectionResult );
+                Iterator iterator = ( (Iterable) injectionResult ).iterator();
+                return iterator.hasNext() ? iterator.next() : null;
             }
         }
         else

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
index 9c2d094..9d0ed4f 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
@@ -25,6 +25,7 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 import org.apache.zest.api.service.NoSuchServiceException;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.service.qualifier.Qualifier;
@@ -32,17 +33,14 @@ import org.apache.zest.api.util.Annotations;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.InvalidInjectionException;
 import org.apache.zest.functional.Iterables;
-import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.runtime.injection.DependencyModel;
 import org.apache.zest.runtime.injection.InjectionContext;
 import org.apache.zest.runtime.injection.InjectionProvider;
 import org.apache.zest.runtime.injection.InjectionProviderFactory;
+import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.runtime.model.Resolution;
 
 import static org.apache.zest.api.util.Annotations.hasAnnotation;
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.first;
-import static org.apache.zest.functional.Iterables.iterable;
 
 public final class ServiceInjectionProviderFactory
     implements InjectionProviderFactory
@@ -53,8 +51,10 @@ public final class ServiceInjectionProviderFactory
         throws InvalidInjectionException
     {
         // TODO This could be changed to allow multiple @Qualifier annotations
-        Annotation qualifierAnnotation = first( filter( Specifications.translate( Annotations.type(), hasAnnotation( Qualifier.class ) ), iterable( dependencyModel
-                                                                                                                                                        .annotations() ) ) );
+        Annotation qualifierAnnotation = Stream.of( dependencyModel.annotations() )
+                                               .filter( Specifications.translate( Annotations.type(),
+                                                                                  hasAnnotation( Qualifier.class ) ) )
+                                               .findFirst().orElse( null );
         Predicate<ServiceReference<?>> serviceQualifier = null;
         if( qualifierAnnotation != null )
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ThisInjectionProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ThisInjectionProviderFactory.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ThisInjectionProviderFactory.java
index 4caf929..4ef09b6 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ThisInjectionProviderFactory.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ThisInjectionProviderFactory.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
 import org.apache.zest.api.composite.CompositeDescriptor;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.InvalidInjectionException;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.runtime.composite.ProxyGenerator;
 import org.apache.zest.runtime.injection.DependencyModel;
 import org.apache.zest.runtime.injection.InjectionContext;
@@ -97,7 +96,7 @@ public final class ThisInjectionProviderFactory
                 }
                 else
                 {
-                    interfaces = Iterables.toArray( Class.class, Iterables.cast( types ) );
+                    interfaces = types.stream().map( Class.class::cast ).toArray( Class[]::new );
                     proxyClass = ProxyGenerator.createProxyClass( mainType.getClassLoader(), interfaces );
                 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/query/IterableQuerySource.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/query/IterableQuerySource.java b/core/runtime/src/main/java/org/apache/zest/runtime/query/IterableQuerySource.java
index 14d4ead..c619f18 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/query/IterableQuerySource.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/query/IterableQuerySource.java
@@ -26,13 +26,16 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import org.apache.zest.api.composite.Composite;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.api.query.grammar.OrderBy;
-import org.apache.zest.api.util.Classes;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.spi.query.QuerySource;
 
+import static java.util.stream.Collectors.toList;
+import static org.apache.zest.api.util.Classes.instanceOf;
+
 /**
  * JAVADOC
  */
@@ -153,13 +156,16 @@ public class IterableQuerySource
     @SuppressWarnings( {"raw", "unchecked"} )
     private <T> List<T> filter( Class<T> resultType, Predicate whereClause )
     {
+        Stream stream = StreamSupport.stream( iterable.spliterator(), false );
         if( whereClause == null )
         {
-            return Iterables.toList( Iterables.filter( Classes.instanceOf( resultType ), iterable ) );
+            return List.class.cast( stream.filter( resultType::isInstance )
+                                          .collect( toList() ) );
         }
         else
         {
-            return Iterables.toList( Iterables.filter( Classes.instanceOf( resultType ).and( whereClause ), iterable ) );
+            return List.class.cast( stream.filter( instanceOf( resultType ).and( whereClause ) )
+                                          .collect( toList() ) );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesInstance.java
index 5e7e8c6..c3e5eef 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesInstance.java
@@ -29,12 +29,10 @@ import org.apache.zest.api.activation.PassivationException;
 import org.apache.zest.api.common.Visibility;
 import org.apache.zest.api.service.ImportedServiceDescriptor;
 import org.apache.zest.api.service.ServiceReference;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.runtime.activation.ActivationDelegate;
 import org.apache.zest.runtime.activation.ActivatorsInstance;
 
-import static org.apache.zest.api.util.Classes.instanceOf;
-import static org.apache.zest.functional.Iterables.filter;
+import static java.util.stream.Collectors.toList;
 
 /**
  * JAVADOC
@@ -67,7 +65,9 @@ public class ImportedServicesInstance
     public void activate()
         throws ActivationException
     {
-        Iterable<Activation> activatees = Iterables.<Activation>cast( filter( instanceOf( Activation.class ), serviceReferences ) );
+        Iterable<Activation> activatees = serviceReferences.stream().filter( Activation.class::isInstance )
+                                                           .map( Activation.class::cast )
+                                                           .collect( toList() );
         activation.activate( ActivatorsInstance.EMPTY, activatees );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesInstance.java
index 3cc42e5..ddfd34f 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesInstance.java
@@ -29,12 +29,10 @@ import org.apache.zest.api.activation.PassivationException;
 import org.apache.zest.api.common.Visibility;
 import org.apache.zest.api.service.ServiceDescriptor;
 import org.apache.zest.api.service.ServiceReference;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.runtime.activation.ActivationDelegate;
 import org.apache.zest.runtime.activation.ActivatorsInstance;
 
-import static org.apache.zest.api.util.Classes.instanceOf;
-import static org.apache.zest.functional.Iterables.filter;
+import static java.util.stream.Collectors.toList;
 
 /**
  * JAVADOC
@@ -65,7 +63,9 @@ public class ServicesInstance
     public void activate()
         throws ActivationException
     {
-        Iterable<Activation> activatees = Iterables.<Activation>cast( filter( instanceOf( Activation.class ), serviceReferences ) );
+        Iterable<Activation> activatees = serviceReferences.stream().filter( Activation.class::isInstance )
+                                                           .map( Activation.class::cast )
+                                                           .collect( toList() );
         activation.activate( ActivatorsInstance.EMPTY, activatees );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
index 7aaec46..a36a65d 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
@@ -42,7 +42,6 @@ import static java.util.stream.Stream.concat;
 import static org.apache.zest.api.common.Visibility.application;
 import static org.apache.zest.api.common.Visibility.layer;
 import static org.apache.zest.api.util.Classes.interfacesOf;
-import static org.apache.zest.functional.Iterables.first;
 
 /**
  * Central place for Composite Type lookups.
@@ -240,9 +239,10 @@ class TypeLookupImpl
     }
 
     @Override
-    public ModelDescriptor lookupServiceModel( Type serviceType1 )
+    public ModelDescriptor lookupServiceModel( Type serviceType )
     {
-        return serviceModels.computeIfAbsent( serviceType1, key -> first( lookupServiceModels( key ) ) );
+        return serviceModels.computeIfAbsent( serviceType,
+                                              key -> lookupServiceModels( key ).stream().findFirst().orElse( null ) );
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
index ec9aa4a..42e0893 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/structure/CompositeDescriptorTest.java
@@ -20,17 +20,16 @@
 package org.apache.zest.runtime.structure;
 
 import org.apache.zest.api.composite.CompositeDescriptor;
-import org.junit.Test;
 import org.apache.zest.api.composite.TransientComposite;
 import org.apache.zest.api.composite.TransientDescriptor;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.test.AbstractZestTest;
+import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.apache.zest.functional.Iterables.first;
 
 public class CompositeDescriptorTest
     extends AbstractZestTest

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java b/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java
index 94ffd0f..85884ae 100644
--- a/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java
+++ b/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java
@@ -58,8 +58,6 @@ import org.apache.zest.api.value.ValueDescriptor;
 import org.apache.zest.api.value.ValueDeserializer;
 import org.apache.zest.api.value.ValueSerializationException;
 
-import static org.apache.zest.functional.Iterables.empty;
-
 /**
  * Adapter for pull-parsing and tree-parsing capable ValueDeserializers.
  *
@@ -673,7 +671,7 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
                 Object entityRefs = stateMap.get( manyAssociation.qualifiedName().name() );
                 if( entityRefs == null )
                 {
-                    return empty();
+                    return Collections.emptySet();
                 }
                 //noinspection unchecked
                 return (Iterable<EntityReference>) entityRefs;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/spi/src/test/java/org/apache/zest/spi/entitystore/helpers/JSONManyAssociationStateTest.java
----------------------------------------------------------------------
diff --git a/core/spi/src/test/java/org/apache/zest/spi/entitystore/helpers/JSONManyAssociationStateTest.java b/core/spi/src/test/java/org/apache/zest/spi/entitystore/helpers/JSONManyAssociationStateTest.java
index f2ebb41..afc3ffc 100644
--- a/core/spi/src/test/java/org/apache/zest/spi/entitystore/helpers/JSONManyAssociationStateTest.java
+++ b/core/spi/src/test/java/org/apache/zest/spi/entitystore/helpers/JSONManyAssociationStateTest.java
@@ -19,22 +19,20 @@
  */
 package org.apache.zest.spi.entitystore.helpers;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
+import org.apache.zest.api.entity.EntityReference;
 import org.apache.zest.api.time.SystemTime;
+import org.apache.zest.spi.entity.EntityStatus;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.apache.zest.api.entity.EntityReference;
-import org.apache.zest.spi.entity.EntityStatus;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertThat;
-import static org.apache.zest.functional.Iterables.map;
-import static org.apache.zest.functional.Iterables.toList;
 
 public class JSONManyAssociationStateTest
 {
@@ -127,14 +125,11 @@ public class JSONManyAssociationStateTest
         assertThat( jsonState.contains( EntityReference.parseEntityReference( "2" ) ), is( true ) );
         assertThat( jsonState.contains( EntityReference.parseEntityReference( "1" ) ), is( true ) );
 
-        List<String> refList = toList( map( new Function<EntityReference, String>()
+        List<String> refList = new ArrayList<>();
+        for( EntityReference ref : jsonState )
         {
-            @Override
-            public String apply( EntityReference from )
-            {
-                return from.identity().toString();
-            }
-        }, jsonState ) );
+            refList.add( ref.identity().toString() );
+        }
         assertThat( refList.isEmpty(), is( false ) );
         assertArrayEquals( new String[]
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
index 8010176..0538448 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
@@ -27,14 +27,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
-import org.apache.zest.api.injection.scope.Structure;
-import org.apache.zest.api.structure.Module;
-import org.junit.Before;
-import org.junit.Test;
+import java.util.stream.StreamSupport;
 import org.apache.zest.api.composite.Composite;
 import org.apache.zest.api.entity.EntityReference;
+import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.query.grammar.OrderBy;
 import org.apache.zest.api.service.ServiceReference;
+import org.apache.zest.api.structure.Module;
 import org.apache.zest.spi.query.EntityFinder;
 import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.spi.query.IndexExporter;
@@ -43,8 +42,10 @@ import org.apache.zest.test.indexing.model.Female;
 import org.apache.zest.test.indexing.model.Male;
 import org.apache.zest.test.indexing.model.Nameable;
 import org.apache.zest.test.indexing.model.Person;
+import org.junit.Before;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static java.util.stream.Collectors.toList;
 import static org.apache.zest.api.query.QueryExpressions.and;
 import static org.apache.zest.api.query.QueryExpressions.eq;
 import static org.apache.zest.api.query.QueryExpressions.ge;
@@ -57,8 +58,8 @@ import static org.apache.zest.api.query.QueryExpressions.or;
 import static org.apache.zest.api.query.QueryExpressions.orderBy;
 import static org.apache.zest.api.query.QueryExpressions.templateFor;
 import static org.apache.zest.api.query.QueryExpressions.variable;
-import static org.apache.zest.functional.Iterables.toList;
 import static org.apache.zest.test.indexing.NameableAssert.assertNames;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Abstract satisfiedBy with tests for the EntityFinder interface.
@@ -339,12 +340,12 @@ public abstract class AbstractEntityFinderTest
         throws EntityFinderException
     {
         // should return only 2 entities
-        final List<EntityReference> references = toList( entityFinder.findEntities(
-            Nameable.class,
-            ALL,
-            NO_SORTING,
-            NO_FIRST_RESULT, 2,
-            NO_VARIABLES ) );
+        final List<EntityReference> references = StreamSupport.stream(
+            entityFinder.findEntities( Nameable.class,
+                                       ALL,
+                                       NO_SORTING,
+                                       NO_FIRST_RESULT, 2,
+                                       NO_VARIABLES ).spliterator(), false ).collect( toList() );
         assertEquals( "2 identitities", 2, references.size() );
     }
 
@@ -353,12 +354,12 @@ public abstract class AbstractEntityFinderTest
         throws EntityFinderException
     {
         // should return only 2 entities starting with third one
-        final List<EntityReference> references = toList( entityFinder.findEntities(
-            Nameable.class,
-            ALL,
-            NO_SORTING,
-            3, 2,
-            NO_VARIABLES ) );
+        final List<EntityReference> references = StreamSupport.stream(
+            entityFinder.findEntities( Nameable.class,
+                                       ALL,
+                                       NO_SORTING,
+                                       3, 2,
+                                       NO_VARIABLES ).spliterator(), false ).collect( toList() );
         assertEquals( "2 identitities", 2, references.size() );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
index b09e52d..671785a 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
@@ -67,7 +67,6 @@ import org.apache.zest.api.structure.LayerDescriptor;
 import org.apache.zest.api.structure.ModuleDescriptor;
 import org.apache.zest.api.value.ValueDescriptor;
 import org.apache.zest.functional.HierarchicalVisitorAdapter;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.index.reindexer.Reindexer;
 import org.apache.zest.index.sql.support.api.SQLAppStartup;
 import org.apache.zest.index.sql.support.api.SQLTypeInfo;
@@ -1437,10 +1436,9 @@ public abstract class AbstractSQLStartup
                         else
                         {
                             valueDescriptors.add( new CompositeDescriptorInfo(
-                                    (LayerDescriptor) Iterables
-                                    .first( Iterables.skip( 1, currentPath ) ),
-                                    (ModuleDescriptor) Iterables.first( currentPath ),
-                                    (CompositeDescriptor) visited ) );
+                                (LayerDescriptor) currentPath.stream().skip( 1 ).findFirst().orElse( null ),
+                                (ModuleDescriptor) currentPath.stream().findFirst().orElse( null ),
+                                (CompositeDescriptor) visited ) );
                         }
 
                         return false;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java b/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
index ad559d9..adc01cc 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
@@ -26,6 +26,8 @@ import javax.servlet.Filter;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContextListener;
 import org.apache.zest.api.identity.Identity;
+import org.apache.zest.api.service.ServiceReference;
+import org.apache.zest.library.http.Interface.Protocol;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.server.Connector;
@@ -38,9 +40,6 @@ import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHandler;
-import org.apache.zest.api.service.ServiceReference;
-import org.apache.zest.functional.Iterables;
-import org.apache.zest.library.http.Interface.Protocol;
 
 import static org.apache.zest.library.http.JettyConfigurationHelper.addContextListeners;
 import static org.apache.zest.library.http.JettyConfigurationHelper.addFilters;
@@ -74,9 +73,9 @@ public abstract class AbstractJettyMixin
     {
         this.identity = identity;
         this.server = jettyServer;
-        this.contextListeners = Iterables.unique( contextListeners );
-        this.servlets = Iterables.unique( servlets );
-        this.filters = Iterables.unique( filters );
+        this.contextListeners = contextListeners;
+        this.servlets = servlets;
+        this.filters = filters;
         this.mBeanServer = mBeanServer;
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java
index ee48065..bf4e1b2 100644
--- a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java
+++ b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ZestMBeans.java
@@ -19,30 +19,21 @@
  */
 package org.apache.zest.library.jmx;
 
-import java.util.function.Predicate;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-import org.apache.zest.functional.Iterables;
 
 /**
  * Helper for working with Zest MBeans.
  */
 public class ZestMBeans
 {
-
     public static ObjectName findServiceName( MBeanServer server, String applicationName, String serviceId )
-            throws MalformedObjectNameException
+        throws MalformedObjectNameException
     {
-        return Iterables.first( Iterables.filter( new Predicate<ObjectName>()
-        {
-            @Override
-            public boolean test( ObjectName item )
-            {
-                return item.getKeyPropertyList().size() == 5;
-            }
-
-        }, server.queryNames( new ObjectName( "Zest:application=" + applicationName + ",*,service=" + serviceId ), null ) ) );
+        ObjectName objectName = new ObjectName( "Zest:application=" + applicationName + ",*,service=" + serviceId );
+        return server.queryNames( objectName, null ).stream()
+                     .filter( item -> item.getKeyPropertyList().size() == 5 )
+                     .findFirst().orElse( null );
     }
-
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
index f062fdb..0c8e940 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
@@ -30,6 +30,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Stream;
 import org.apache.zest.api.association.ManyAssociation;
 import org.apache.zest.api.association.NamedAssociation;
 import org.apache.zest.api.common.Optional;
@@ -42,8 +43,8 @@ import org.apache.zest.api.injection.scope.Service;
 import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.injection.scope.Uses;
 import org.apache.zest.api.structure.Module;
-import org.apache.zest.api.unitofwork.NoSuchEntityTypeException;
 import org.apache.zest.api.unitofwork.NoSuchEntityException;
+import org.apache.zest.api.unitofwork.NoSuchEntityTypeException;
 import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
 import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueComposite;
@@ -71,9 +72,6 @@ import org.restlet.resource.ResourceException;
 import org.slf4j.LoggerFactory;
 
 import static org.apache.zest.api.util.Annotations.isType;
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.first;
-import static org.apache.zest.functional.Iterables.iterable;
 import static org.apache.zest.library.rest.server.api.ObjectSelection.current;
 
 /**
@@ -901,7 +899,7 @@ public class ContextResource
             // Construct form out of individual parameters instead
             for( Annotation[] annotations : interactionMethod.getParameterAnnotations() )
             {
-                Name name = (Name) first( filter( isType( Name.class ), iterable( annotations ) ) );
+                Name name = (Name) Stream.of( annotations ).filter( isType( Name.class ) ).findFirst().orElse( null );
                 form.add( name.value(), getValue( name.value(), queryAsForm, entityAsForm ) );
             }
         }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/requestreader/DefaultRequestReader.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/requestreader/DefaultRequestReader.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/requestreader/DefaultRequestReader.java
index 642d1c1..b96cc29 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/requestreader/DefaultRequestReader.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/requestreader/DefaultRequestReader.java
@@ -31,6 +31,7 @@ import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.stream.Stream;
 import org.apache.zest.api.association.AssociationDescriptor;
 import org.apache.zest.api.common.Optional;
 import org.apache.zest.api.constraint.Name;
@@ -49,7 +50,6 @@ import org.apache.zest.api.value.ValueComposite;
 import org.apache.zest.api.value.ValueDeserializer;
 import org.apache.zest.api.value.ValueSerialization;
 import org.apache.zest.api.value.ValueSerializationException;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.library.rest.server.spi.RequestReader;
 import org.restlet.Request;
 import org.restlet.Response;
@@ -65,10 +65,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.apache.zest.api.util.Annotations.isType;
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.first;
-import static org.apache.zest.functional.Iterables.iterable;
-import static org.apache.zest.functional.Iterables.matchesAny;
 
 /**
  * Convert request into method arguments.
@@ -338,7 +334,7 @@ public class DefaultRequestReader
             },
             (Function<AssociationDescriptor, Iterable<EntityReference>>) associationDescriptor -> {
                 // TODO
-                return Iterables.empty();
+                return Collections.emptySet();
             },
             new Function<AssociationDescriptor, Map<String, EntityReference>>()
             {
@@ -361,8 +357,8 @@ public class DefaultRequestReader
         int idx = 0;
         for( Annotation[] annotations : method.getParameterAnnotations() )
         {
-            Name name = (Name) first( filter( isType( Name.class ), iterable( annotations ) ) );
-
+            Name name = (Name) Stream.of( annotations ).filter( isType( Name.class ) )
+                                     .findFirst().orElse( null );
             if( name == null )
             {
                 throw new IllegalStateException( "No @Name annotation found on parameter of method:" + method );
@@ -500,7 +496,7 @@ public class DefaultRequestReader
                                                     + " of type " + parameterType.getName() );
             }
 
-            if( arg == null && !matchesAny( isType( Optional.class ), iterable( annotations ) ) )
+            if( arg == null && Stream.of( annotations ).noneMatch( isType( Optional.class ) ) )
             {
                 throw new IllegalArgumentException( "Parameter " + name.value() + " was not set" );
             }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/fdf596b9/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/responsewriter/ResourceResponseWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/responsewriter/ResourceResponseWriter.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/responsewriter/ResourceResponseWriter.java
index cc20ee5..29f9a7e 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/responsewriter/ResourceResponseWriter.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/responsewriter/ResourceResponseWriter.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.zest.api.injection.scope.Service;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.library.rest.common.Resource;
 import org.apache.zest.library.rest.common.link.LinksUtil;
 import org.restlet.Response;
@@ -60,11 +59,11 @@ public class ResourceResponseWriter extends AbstractResponseWriter
 
             // Allowed methods
             response.getAllowedMethods().add( Method.GET );
-            if( Iterables.matchesAny( LinksUtil.withRel( "delete" ), resourceValue.commands().get() ) )
+            if( resourceValue.commands().get().stream().anyMatch( LinksUtil.withRel( "delete" ) ) )
             {
                 response.getAllowedMethods().add( Method.DELETE );
             }
-            if( Iterables.matchesAny( LinksUtil.withRel( "update" ), resourceValue.commands().get() ) )
+            if( resourceValue.commands().get().stream().anyMatch( LinksUtil.withRel( "update" ) ) )
             {
                 response.getAllowedMethods().add( Method.PUT );
             }


[03/14] zest-java git commit: build: set task desc & group for performance tests

Posted by pa...@apache.org.
build: set task desc & group for performance tests


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

Branch: refs/heads/develop
Commit: 3e3a8f2907db2c2486198b36fb478c727b8c897d
Parents: d74b369
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 27 10:36:09 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 27 10:36:09 2016 +0100

----------------------------------------------------------------------
 .../src/main/groovy/org/apache/zest/gradle/TaskGroups.groovy  | 2 ++
 tests/performance/build.gradle                                | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/3e3a8f29/buildSrc/src/main/groovy/org/apache/zest/gradle/TaskGroups.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/TaskGroups.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/TaskGroups.groovy
index fb97c47..53a5b5e 100644
--- a/buildSrc/src/main/groovy/org/apache/zest/gradle/TaskGroups.groovy
+++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/TaskGroups.groovy
@@ -31,6 +31,8 @@ class TaskGroups
   static final String DOCUMENTATION = JavaBasePlugin.DOCUMENTATION_GROUP
   static final String DISTRIBUTION = ApplicationPlugin.APPLICATION_GROUP
   static final String DISTRIBUTION_VERIFICATION = 'distribution verification'
+  static final String PERFORMANCE = 'performance'
+  static final String PERFORMANCE_VERIFICATION = 'performance verification'
   static final String RELEASE = 'release'
   static final String RELEASE_VERIFICATION = 'release verification'
   static final String UPLOAD = BasePlugin.UPLOAD_GROUP

http://git-wip-us.apache.org/repos/asf/zest-java/blob/3e3a8f29/tests/performance/build.gradle
----------------------------------------------------------------------
diff --git a/tests/performance/build.gradle b/tests/performance/build.gradle
index f39266c..af5e790 100644
--- a/tests/performance/build.gradle
+++ b/tests/performance/build.gradle
@@ -14,9 +14,8 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
- *
  */
+import org.apache.zest.gradle.TaskGroups
 
 description = "Apache Zest\u2122 Performance Test Suite."
 
@@ -53,6 +52,10 @@ dependencies {
 check.dependsOn compilePerfJava
 
 task testPerf( type: Test, dependsOn: jar ) {
+  group = TaskGroups.PERFORMANCE
+  description = 'Runs performance tests.'
+  maxParallelForks = 1
+  forkEvery = 1
   testClassesDir = sourceSets.perf.output.classesDir
   classpath = sourceSets.perf.runtimeClasspath
   systemProperties[ 'jar.path' ] = jar.archivePath


[14/14] zest-java git commit: runtime: refine TypeLookup

Posted by pa...@apache.org.
runtime: refine TypeLookup

Remove stream terminal operations here and there
Remove method that didn\u2019t belong here
Add caching for frequently called methods


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

Branch: refs/heads/develop
Commit: d313c1329cf83265365ea1dfa2c28b6832847cf8
Parents: b4c2644
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 15:49:02 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 15:49:02 2016 +0100

----------------------------------------------------------------------
 .../apache/zest/api/structure/TypeLookup.java   |  30 ++-
 .../zest/runtime/structure/ModuleInstance.java  |  10 +-
 .../zest/runtime/structure/TypeLookupImpl.java  | 263 +++++++++++--------
 .../runtime/unitofwork/ModuleUnitOfWork.java    |   2 +-
 4 files changed, 185 insertions(+), 120 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/d313c132/core/api/src/main/java/org/apache/zest/api/structure/TypeLookup.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/structure/TypeLookup.java b/core/api/src/main/java/org/apache/zest/api/structure/TypeLookup.java
index ee2f9ec..2ea55bf 100644
--- a/core/api/src/main/java/org/apache/zest/api/structure/TypeLookup.java
+++ b/core/api/src/main/java/org/apache/zest/api/structure/TypeLookup.java
@@ -27,7 +27,6 @@ import org.apache.zest.api.composite.ModelDescriptor;
 import org.apache.zest.api.composite.TransientDescriptor;
 import org.apache.zest.api.entity.EntityDescriptor;
 import org.apache.zest.api.object.ObjectDescriptor;
-import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.value.ValueDescriptor;
 
 public interface TypeLookup
@@ -106,7 +105,7 @@ public interface TypeLookup
     /**
      * Lookup all Entity Models matching the given Type.
      *
-     * <p>Returned Iterable contains, in order, Entity Models that: </p>
+     * <p>Returned List contains, in order, Entity Models that: </p>
      *
      * <ul>
      * <li>exactly match the given type, in Visibility then Assembly order ;</li>
@@ -125,7 +124,7 @@ public interface TypeLookup
      *
      * @return All matching Entity Models
      */
-    Iterable<? extends EntityDescriptor> lookupEntityModels( Class<?> type );
+    List<EntityDescriptor> lookupEntityModels( Class<?> type );
 
     /**
      * Lookup first ServiceDescriptor/ImportedServiceDescriptor matching the given Type.
@@ -161,15 +160,28 @@ public interface TypeLookup
      */
     List<? extends ModelDescriptor> lookupServiceModels( Type type );
 
-    Stream<? extends ObjectDescriptor> allObjects();
+    /**
+     * @return All visible Objects, in visibility order
+     */
+    Stream<ObjectDescriptor> allObjects();
 
-    Stream<? extends TransientDescriptor> allTransients();
+    /**
+     * @return All visible Transients, in visibility order
+     */
+    Stream<TransientDescriptor> allTransients();
 
-    Stream<? extends ValueDescriptor> allValues();
+    /**
+     * @return All visible Values, in visibility order
+     */
+    Stream<ValueDescriptor> allValues();
 
-    Stream<? extends EntityDescriptor> allEntities();
+    /**
+     * @return All visible Entities, in visibility order
+     */
+    Stream<EntityDescriptor> allEntities();
 
+    /**
+     * @return All visible Services, in visibility order
+     */
     Stream<? extends ModelDescriptor> allServices();
-
-    Stream<Class<?>> allVisibleObjects();
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d313c132/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java
index 96278ed..36a2f46 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java
@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -58,6 +59,7 @@ import org.apache.zest.api.structure.LayerDescriptor;
 import org.apache.zest.api.structure.Module;
 import org.apache.zest.api.structure.ModuleDescriptor;
 import org.apache.zest.api.structure.TypeLookup;
+import org.apache.zest.api.type.HasTypes;
 import org.apache.zest.api.unitofwork.UnitOfWorkException;
 import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
 import org.apache.zest.api.util.NullArgumentException;
@@ -173,7 +175,8 @@ public class ModuleInstance
 
         if( model == null )
         {
-            throw new NoSuchObjectException( mixinType.getName(), name(), typeLookup.allVisibleObjects() );
+            throw new NoSuchObjectException( mixinType.getName(), name(),
+                                             typeLookup.allObjects().flatMap( HasTypes::types ) );
         }
 
         InjectionContext injectionContext = new InjectionContext( model.module(), UsesInstance.EMPTY_USES.use( uses ) );
@@ -189,7 +192,8 @@ public class ModuleInstance
 
         if( model == null )
         {
-            throw new NoSuchObjectException( instance.getClass().getName(), name(), typeLookup.allVisibleObjects() );
+            throw new NoSuchObjectException( instance.getClass().getName(), name(),
+                                             typeLookup.allObjects().flatMap( HasTypes::types ) );
         }
 
         InjectionContext injectionContext = new InjectionContext( model.module(), UsesInstance.EMPTY_USES.use( uses ) );
@@ -398,7 +402,7 @@ public class ModuleInstance
         //noinspection unchecked
         return serviceModels.stream()
             .map( this::findServiceReferenceInstance )
-            .filter( ref -> ref != null )
+            .filter( Objects::nonNull )
             .filter( ref -> ref.hasType( serviceType ) )
             .map( ref -> (ServiceReference<T>) ref )
             .collect( Collectors.toList() );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d313c132/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
index a36a65d..f9cc137 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/TypeLookupImpl.java
@@ -25,7 +25,7 @@ import java.lang.reflect.WildcardType;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 import org.apache.zest.api.common.Visibility;
 import org.apache.zest.api.composite.AmbiguousTypeException;
@@ -38,6 +38,7 @@ import org.apache.zest.api.structure.TypeLookup;
 import org.apache.zest.api.type.HasTypes;
 import org.apache.zest.api.value.ValueDescriptor;
 
+import static java.util.stream.Collectors.toList;
 import static java.util.stream.Stream.concat;
 import static org.apache.zest.api.common.Visibility.application;
 import static org.apache.zest.api.common.Visibility.layer;
@@ -54,13 +55,18 @@ class TypeLookupImpl
     private final ModuleDescriptor moduleModel;
 
     // Eager instance objects
+    private final LazyValue<List<ObjectDescriptor>> allObjects;
+    private final LazyValue<List<TransientDescriptor>> allTransients;
+    private final LazyValue<List<ValueDescriptor>> allValues;
+    private final LazyValue<List<EntityDescriptor>> allEntities;
+    private final LazyValue<List<? extends ModelDescriptor>> allServices;
     private final ConcurrentHashMap<Class<?>, ObjectDescriptor> objectModels;
     private final ConcurrentHashMap<Class<?>, TransientDescriptor> transientModels;
     private final ConcurrentHashMap<Class<?>, ValueDescriptor> valueModels;
-    private final ConcurrentHashMap<Class<?>, List<? extends EntityDescriptor>> allEntityModels;
+    private final ConcurrentHashMap<Class<?>, List<EntityDescriptor>> allEntityModels;
     private final ConcurrentHashMap<Class<?>, EntityDescriptor> unambiguousEntityModels;
     private final ConcurrentHashMap<Type, ModelDescriptor> serviceModels;
-    private final ConcurrentHashMap<Type, List<ModelDescriptor>> servicesReferences;
+    private final ConcurrentHashMap<Type, List<? extends ModelDescriptor>> servicesReferences;
 
     /**
      * Create a new TypeLookup bound to the given moduleModel.
@@ -73,6 +79,11 @@ class TypeLookupImpl
         this.moduleModel = module;
 
         // Eager instance objects
+        allObjects = new LazyValue<>();
+        allTransients = new LazyValue<>();
+        allValues = new LazyValue<>();
+        allEntities = new LazyValue<>();
+        allServices = new LazyValue<>();
         objectModels = new ConcurrentHashMap<>();
         transientModels = new ConcurrentHashMap<>();
         valueModels = new ConcurrentHashMap<>();
@@ -102,7 +113,7 @@ class TypeLookupImpl
     {
         return objectModels.computeIfAbsent( type, key ->
         {
-            List<ObjectDescriptor> allModels = allObjects().collect( Collectors.toList() );
+            List<? extends ObjectDescriptor> allModels = getAllObjects();
             ObjectDescriptor model = ambiguityMatching( key, allModels, new ExactTypeMatching<>( key ) );
             if( model == null )
             {
@@ -132,7 +143,7 @@ class TypeLookupImpl
     {
         return transientModels.computeIfAbsent( type, key ->
         {
-            List<TransientDescriptor> allModels = allTransients().collect( Collectors.toList() );
+            List<? extends TransientDescriptor> allModels = getAllTransients();
             TransientDescriptor model = ambiguityMatching( key, allModels, new ExactTypeMatching<>( key ) );
             if( model == null )
             {
@@ -162,7 +173,7 @@ class TypeLookupImpl
     {
         return valueModels.computeIfAbsent( type, key ->
         {
-            List<ValueDescriptor> allModels = allValues().collect( Collectors.toList() );
+            List<? extends ValueDescriptor> allModels = getAllValues();
             ValueDescriptor model = ambiguityMatching( key, allModels, new ExactTypeMatching<>( key ) );
             if( model == null )
             {
@@ -195,7 +206,7 @@ class TypeLookupImpl
     {
         return unambiguousEntityModels.computeIfAbsent( type, key ->
         {
-            List<EntityDescriptor> allModels = allEntities().collect( Collectors.toList() );
+            List<? extends EntityDescriptor> allModels = getAllEntities();
             EntityDescriptor model = ambiguityMatching( key, allModels, new ExactTypeMatching<>( key ) );
             if( model == null )
             {
@@ -228,13 +239,13 @@ class TypeLookupImpl
      * @return All matching Entity Models
      */
     @Override
-    public Iterable<? extends EntityDescriptor> lookupEntityModels( final Class type )
+    public List<EntityDescriptor> lookupEntityModels( final Class type )
     {
         return allEntityModels.computeIfAbsent( type, key ->
             concat(
                 allEntities().filter( ref -> new ExactTypeMatching<>( key ).test( ref ) ),
                 allEntities().filter( ref -> new AssignableFromTypeMatching<>( key ).test( ref ) )
-            ).distinct().collect( Collectors.toList() )
+            ).distinct().collect( toList() )
         );
     }
 
@@ -246,144 +257,163 @@ class TypeLookupImpl
     }
 
     @Override
-    public List<? extends ModelDescriptor> lookupServiceModels( Type type1 )
+    public List<? extends ModelDescriptor> lookupServiceModels( final Type type1 )
     {
         return servicesReferences.computeIfAbsent( type1, type ->
         {
             // There is a requirement that "exact match" services must be returned before "assignable match"
             // services, hence the dual streams instead of a OR filter.
-            return Stream.concat(
-                allServices()
-                    .filter( new ExactTypeMatching<>( type ) ),
-                allServices()
-                    .filter( new AssignableFromTypeMatching<>( type ) ) )
-                .distinct()
-                .collect( Collectors.toList() );
+            return Stream.concat( allServices().filter( new ExactTypeMatching<>( type ) ),
+                                  allServices().filter( new AssignableFromTypeMatching<>( type ) ) )
+                         .distinct()
+                         .collect( toList() );
         } );
     }
 
     @Override
-    public Stream<Class<?>> allVisibleObjects()
+    public Stream<ObjectDescriptor> allObjects()
     {
-        return allObjects().flatMap( HasTypes::types );
+        return getAllObjects().stream();
     }
 
-    @Override
-    public Stream<? extends ObjectDescriptor> allObjects()
+    private List<ObjectDescriptor> getAllObjects()
     {
-        return concat( moduleModel.objects(),
-                       concat(
-                           concat(
-                               moduleModel.layer().visibleObjects( layer ),
-                               moduleModel.layer().visibleObjects( application )
-                           ),
-                           moduleModel.layer()
-                               .usedLayers()
-                               .layers()
-                               .flatMap( layer -> layer.visibleObjects( application ) )
-                       )
+        return allObjects.computeIfAbsent(
+            () -> concat( moduleModel.objects(),
+                          concat(
+                              concat(
+                                  moduleModel.layer().visibleObjects( layer ),
+                                  moduleModel.layer()
+                                             .visibleObjects( application )
+                              ),
+                              moduleModel.layer()
+                                         .usedLayers()
+                                         .layers()
+                                         .flatMap( layer -> layer.visibleObjects( application ) )
+                          )
+            ).collect( toList() )
         );
     }
 
     @Override
-    public Stream<? extends TransientDescriptor> allTransients()
+    public Stream<TransientDescriptor> allTransients()
+    {
+        return getAllTransients().stream();
+    }
+
+    private List<TransientDescriptor> getAllTransients()
     {
-        return concat( moduleModel.transientComposites(),
-                       concat(
-                           concat(
-                               moduleModel.layer().visibleTransients( layer ),
-                               moduleModel.layer().visibleTransients( application )
-                           ),
-                           moduleModel.layer()
-                               .usedLayers()
-                               .layers()
-                               .flatMap( layer -> layer.visibleTransients( application ) )
-                       )
+        return allTransients.computeIfAbsent(
+            () -> concat( moduleModel.transientComposites(),
+                          concat(
+                              concat(
+                                  moduleModel.layer().visibleTransients( layer ),
+                                  moduleModel.layer().visibleTransients( application )
+                              ),
+                              moduleModel.layer()
+                                         .usedLayers()
+                                         .layers()
+                                         .flatMap( layer -> layer.visibleTransients( application ) )
+                          )
+            ).collect( toList() )
         );
     }
 
     @Override
-    public Stream<? extends ValueDescriptor> allValues()
+    public Stream<ValueDescriptor> allValues()
     {
+        return getAllValues().stream();
+    }
 
-        return concat( moduleModel.valueComposites(),
-                       concat(
-                           concat( moduleModel.layer().visibleValues( layer ),
-                                   moduleModel.layer().visibleValues( application )
-                           ),
-                           moduleModel.layer()
-                               .usedLayers()
-                               .layers()
-                               .flatMap( layer1 -> layer1.visibleValues( application ) )
-                       )
+    private List<ValueDescriptor> getAllValues()
+    {
+        return allValues.computeIfAbsent(
+            () -> concat( moduleModel.valueComposites(),
+                          concat(
+                              concat( moduleModel.layer().visibleValues( layer ),
+                                      moduleModel.layer().visibleValues( application )
+                              ),
+                              moduleModel.layer()
+                                         .usedLayers()
+                                         .layers()
+                                         .flatMap( layer1 -> layer1.visibleValues( application ) )
+                          )
+            ).collect( toList() )
         );
     }
 
     @Override
-    public Stream<? extends EntityDescriptor> allEntities()
+    public Stream<EntityDescriptor> allEntities()
+    {
+        return getAllEntities().stream();
+    }
+
+    private List<EntityDescriptor> getAllEntities()
     {
-        return concat( moduleModel.entityComposites(),
-                       concat(
-                           concat(
-                               moduleModel.layer().visibleEntities( layer ),
-                               moduleModel.layer().visibleEntities( application )
-                           ),
-                           moduleModel.layer()
-                               .usedLayers()
-                               .layers()
-                               .flatMap( layer -> layer.visibleEntities( application ) )
-                       )
+        return allEntities.computeIfAbsent(
+            () -> concat( moduleModel.entityComposites(),
+                          concat(
+                              concat(
+                                  moduleModel.layer().visibleEntities( layer ),
+                                  moduleModel.layer().visibleEntities( application )
+                              ),
+                              moduleModel.layer()
+                                         .usedLayers()
+                                         .layers()
+                                         .flatMap( layer -> layer.visibleEntities( application ) )
+                          )
+            ).collect( toList() )
         );
     }
 
     @Override
     public Stream<? extends ModelDescriptor> allServices()
     {
-        Stream<? extends ModelDescriptor> managedServices =
-            concat( moduleModel.serviceComposites(),
-                    concat(
+        return getAllServices().stream();
+    }
+
+    public List<? extends ModelDescriptor> getAllServices()
+    {
+        return allServices.computeIfAbsent(
+            () -> concat(
+                concat( moduleModel.serviceComposites(),
                         concat(
+                            concat(
+                                moduleModel.layer().visibleServices( layer ),
+                                moduleModel.layer().visibleServices( application )
+                            ),
                             moduleModel.layer()
-                                .visibleServices( layer ),
-                            moduleModel.layer()
-                                .visibleServices( application )
-                        ),
-                        moduleModel.layer()
-                            .usedLayers()
-                            .layers()
-                            .flatMap( layer -> layer.visibleServices( application ) )
-                    )
-            );
-        Stream<? extends ModelDescriptor> importedServices =
-            concat( moduleModel.importedServices(),
-                    concat(
+                                       .usedLayers()
+                                       .layers()
+                                       .flatMap( layer -> layer.visibleServices( application ) )
+                        )
+                ),
+                concat( moduleModel.importedServices(),
                         concat(
+                            concat(
+                                moduleModel.layer().visibleServices( layer ),
+                                moduleModel.layer().visibleServices( application )
+                            ),
                             moduleModel.layer()
-                                .visibleServices( layer ),
-                            moduleModel.layer()
-                                .visibleServices( application )
-                        ),
-                        moduleModel.layer()
-                            .usedLayers()
-                            .layers()
-                            .flatMap( layer -> layer.visibleServices( application ) )
-                    )
-            );
-        return concat( managedServices, importedServices );
+                                       .usedLayers()
+                                       .layers()
+                                       .flatMap( layer -> layer.visibleServices( application ) )
+                        )
+                )
+            ).collect( toList() )
+        );
     }
 
-    private <T extends ModelDescriptor> T ambiguityMatching(
+    private static <T extends ModelDescriptor> T ambiguityMatching(
         Class type,
         List<T> modelModules,
         TypeMatching<T> matching
     )
     {
         List<T> models = modelModules.stream()
-            .filter( matching )
-            .filter( new SameVisibility<>() )
-            .distinct()
-            .collect( Collectors.toList() );
-
+                                     .filter( matching.and( new SameVisibility<>() ) )
+                                     .distinct()
+                                     .collect( toList() );
         if( models.size() > 1 )
         {
             throw new AmbiguousTypeException( "More than one type matches " + type.getName() + ": " + models + "]" );
@@ -420,7 +450,7 @@ class TypeLookupImpl
                     // First check Foo
                     ParameterizedType parameterizedType = (ParameterizedType) lookedUpType;
                     Type rawType = parameterizedType.getRawType();
-                    if( !model.types().anyMatch( checkMatch( rawType ) ) )
+                    if( model.types().noneMatch( checkMatch( rawType ) ) )
                     {
                         return false;
                     }
@@ -438,7 +468,7 @@ class TypeLookupImpl
         protected abstract Predicate<Type> checkMatch( Type matchTo );
     }
 
-    private static final class ExactTypeMatching<T extends HasTypes> extends TypeMatching<T>
+    private static class ExactTypeMatching<T extends HasTypes> extends TypeMatching<T>
     {
         private ExactTypeMatching( Type lookedUpType )
         {
@@ -451,7 +481,7 @@ class TypeLookupImpl
         }
     }
 
-    private static final class AssignableFromTypeMatching<T extends HasTypes> extends TypeMatching<T>
+    private static class AssignableFromTypeMatching<T extends HasTypes> extends TypeMatching<T>
     {
         private AssignableFromTypeMatching( Type lookedUpType )
         {
@@ -464,17 +494,16 @@ class TypeLookupImpl
 //            if( matchTo instanceof Class )
             {
                 Class<?> clazz = (Class<?>) matchTo;
-                return candidate ->
-                    !candidate.equals( matchTo ) && clazz.isAssignableFrom( (Class<?>) candidate );
+                return candidate -> !candidate.equals( matchTo ) && clazz.isAssignableFrom( (Class<?>) candidate );
             }
 //            return candidate -> candidate.equals( matchTo );
         }
     }
 
     /**
-     * This Predicate will filter out all Models that doesn't have the same visisbility as the first one.
+     * This Predicate will filter out all Models that doesn't have the same visibility as the first one.
      */
-    private class SameVisibility<T extends ModelDescriptor>
+    private static class SameVisibility<T extends ModelDescriptor>
         implements Predicate<T>
     {
         private Visibility current = null;
@@ -490,4 +519,24 @@ class TypeLookupImpl
             return current == model.visibility();
         }
     }
+
+    private static class LazyValue<T>
+    {
+        private volatile T value;
+
+        public T computeIfAbsent( Supplier<T> supplier )
+        {
+            if( value == null )
+            {
+                synchronized( this )
+                {
+                    if( value == null )
+                    {
+                        value = supplier.get();
+                    }
+                }
+            }
+            return value;
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d313c132/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/ModuleUnitOfWork.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/ModuleUnitOfWork.java b/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/ModuleUnitOfWork.java
index beadcf0..0d1e3bb 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/ModuleUnitOfWork.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/ModuleUnitOfWork.java
@@ -293,7 +293,7 @@ public class ModuleUnitOfWork
     public <T> T get( Class<T> type, Identity identity )
         throws NoSuchEntityTypeException, NoSuchEntityException
     {
-        Iterable<? extends EntityDescriptor> models = module.typeLookup().lookupEntityModels( type );
+        Iterable<EntityDescriptor> models = module.typeLookup().lookupEntityModels( type );
 
         if( !models.iterator().hasNext() )
         {


[05/14] zest-java git commit: uowfile library: prefer nio over core/io

Posted by pa...@apache.org.
uowfile library: prefer nio over core/io


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

Branch: refs/heads/develop
Commit: 94f7cca8ed0eefd9abdce1beea14f52dd40f24de
Parents: 95c1b24
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 09:53:57 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 09:53:57 2016 +0100

----------------------------------------------------------------------
 .../zest/library/uowfile/internal/UoWFile.java  | 21 ++++----
 .../zest/library/uowfile/HasUoWFileTest.java    | 50 ++++++++++++--------
 .../zest/library/uowfile/HasUoWFilesTest.java   | 40 ++++++++++------
 3 files changed, 66 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/94f7cca8/libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/internal/UoWFile.java
----------------------------------------------------------------------
diff --git a/libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/internal/UoWFile.java b/libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/internal/UoWFile.java
index 0785d30..1228d4b 100644
--- a/libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/internal/UoWFile.java
+++ b/libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/internal/UoWFile.java
@@ -21,16 +21,14 @@ package org.apache.zest.library.uowfile.internal;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.concurrent.atomic.AtomicLong;
-import org.apache.zest.io.Inputs;
-import org.apache.zest.io.Outputs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class UoWFile
 {
     /* package */ static final Logger LOGGER = LoggerFactory.getLogger( "org.apache.zest.library.uowfile" );
-    private static final int FILE_BUFFER_SIZE = 4096;
     private static final AtomicLong COUNT = new AtomicLong( 0L );
     private final long originalIdentity;
     private final File original;
@@ -56,11 +54,11 @@ public class UoWFile
     {
         StringBuilder sb = new StringBuilder().append( UoWFile.class.getSimpleName() );
         // UoWFile{parent/( original(oid->id) | current(id) | backup(id) )}
-        sb.append( "{" ).append( original.getParentFile().getName() ).append( "/( " ).
-            append( original.getName() ).append( "(" ).append( originalIdentity ).append( "->" ).append( fileTag( original ) ).append( ") | " ).
-            append( current.getName() ).append( "(" ).append( fileTag( current ) ).append( ") | " ).
-            append( backup.getName() ).append( "(" ).append( fileTag( backup ) ).
-            append( ") )}" );
+        sb.append( "{" ).append( original.getParentFile().getName() ).append( "/( " )
+          .append( original.getName() ).append( "(" ).append( originalIdentity ).append( "->" )
+          .append( fileTag( original ) ).append( ") | " ).append( current.getName() )
+          .append( "(" ).append( fileTag( current ) ).append( ") | " ).append( backup.getName() )
+          .append( "(" ).append( fileTag( backup ) ).append( ") )}" );
         return sb.toString();
     }
 
@@ -80,7 +78,9 @@ public class UoWFile
         {
             if( fileTag( original ) != originalIdentity )
             {
-                LOGGER.info( "Concurrent modification, original creation reference is {} and original apply reference is {}", originalIdentity, fileTag( original ) );
+                LOGGER.info(
+                    "Concurrent modification, original creation reference is {} and original apply reference is {}",
+                    originalIdentity, fileTag( original ) );
                 throw new ConcurrentUoWFileStateModificationException( this );
             }
             if( original.exists() )
@@ -132,7 +132,7 @@ public class UoWFile
     {
         try
         {
-            Inputs.byteBuffer( source, FILE_BUFFER_SIZE ).transferTo( Outputs.byteBuffer( dest ) );
+            Files.copy( source.toPath(), dest.toPath() );
         }
         catch( IOException ex )
         {
@@ -165,5 +165,4 @@ public class UoWFile
                          + "Are they on different filesystems?", source, dest );
         }
     }
-
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/94f7cca8/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
----------------------------------------------------------------------
diff --git a/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java b/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
index 8a53c0a..2796f83 100644
--- a/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
+++ b/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java
@@ -21,6 +21,7 @@ package org.apache.zest.library.uowfile;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.util.ArrayList;
@@ -42,8 +43,6 @@ import org.apache.zest.api.unitofwork.concern.UnitOfWorkPropagation;
 import org.apache.zest.api.unitofwork.concern.UnitOfWorkRetry;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.io.Inputs;
-import org.apache.zest.io.Outputs;
 import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
 import org.apache.zest.library.uowfile.bootstrap.UoWFileAssembler;
 import org.apache.zest.library.uowfile.internal.ConcurrentUoWFileModificationException;
@@ -59,6 +58,7 @@ import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -171,9 +171,11 @@ public class HasUoWFileTest
             File attachedFile = entity.attachedFile();
             File managedFile = entity.managedFile();
             // END SNIPPET: api
-            Inputs.text( MODIFICATION_CONTENT_URL ).transferTo( Outputs.text( managedFile ) );
+            try( InputStream input = MODIFICATION_CONTENT_URL.openStream() )
+            {
+                Files.copy( input, managedFile.toPath(), REPLACE_EXISTING );
+            }
         }
-
     }
 
     @Override
@@ -225,9 +227,9 @@ public class HasUoWFileTest
         }
         try( Stream<String> lines = Files.lines( attachedFile.toPath() ) )
         {
-            assertThat("File content was not the good one",
-                       lines.limit( 1 ).findFirst().get(),
-                       equalTo( "Creation" ) );
+            assertThat( "File content was not the good one",
+                        lines.limit( 1 ).findFirst().get(),
+                        equalTo( "Creation" ) );
         }
     }
 
@@ -255,9 +257,9 @@ public class HasUoWFileTest
         }
         try( Stream<String> lines = Files.lines( attachedFile.toPath() ) )
         {
-            assertThat("File content after discarded modification was not the good one",
-                       lines.limit( 1 ).findFirst().get(),
-                       equalTo( "Creation" ) );
+            assertThat( "File content after discarded modification was not the good one",
+                        lines.limit( 1 ).findFirst().get(),
+                        equalTo( "Creation" ) );
         }
 
         // Testing completed modification
@@ -268,9 +270,9 @@ public class HasUoWFileTest
         }
         try( Stream<String> lines = Files.lines( attachedFile.toPath() ) )
         {
-            assertThat("Modified file content was not the good one",
-                       lines.limit( 1 ).findFirst().get(),
-                       equalTo( "Modification" ) );
+            assertThat( "Modified file content was not the good one",
+                        lines.limit( 1 ).findFirst().get(),
+                        equalTo( "Modification" ) );
         }
     }
 
@@ -330,11 +332,17 @@ public class HasUoWFileTest
 
         uow = unitOfWorkFactory.newUnitOfWork();
         entity = uow.get( TestedEntity.class, entityId );
-        Inputs.text( MODIFICATION_CONTENT_URL ).transferTo( Outputs.text( entity.managedFile() ) );
+        try( InputStream input = MODIFICATION_CONTENT_URL.openStream() )
+        {
+            Files.copy( input, entity.managedFile().toPath(), REPLACE_EXISTING );
+        }
 
         uow2 = unitOfWorkFactory.newUnitOfWork();
         entity = uow2.get( TestedEntity.class, entityId );
-        Inputs.text( MODIFICATION_CONTENT_URL ).transferTo( Outputs.text( entity.managedFile() ) );
+        try( InputStream input = MODIFICATION_CONTENT_URL.openStream() )
+        {
+            Files.copy( input, entity.managedFile().toPath(), REPLACE_EXISTING );
+        }
 
         uow.complete();
         try
@@ -403,9 +411,9 @@ public class HasUoWFileTest
         assertTrue( "There were errors during TestRetry", ex.isEmpty() );
         try( Stream<String> lines = Files.lines( attachedFile.toPath() ) )
         {
-            assertThat("Modified file content was not the good one",
-                       lines.limit( 1 ).findFirst().get(),
-                       equalTo( "Modification" ) );
+            assertThat( "Modified file content was not the good one",
+                        lines.limit( 1 ).findFirst().get(),
+                        equalTo( "Modification" ) );
         }
     }
 
@@ -416,8 +424,10 @@ public class HasUoWFileTest
         TestedEntity entity = builder.instance();
         entity.name().set( name );
         entity = builder.newInstance();
-        Inputs.text( CREATION_CONTENT_URL ).transferTo( Outputs.text( entity.managedFile() ) );
+        try( InputStream input = CREATION_CONTENT_URL.openStream() )
+        {
+            Files.copy( input, entity.managedFile().toPath() );
+        }
         return entity;
     }
-
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/94f7cca8/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
----------------------------------------------------------------------
diff --git a/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java b/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
index 4cdb275..8630de9 100644
--- a/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
+++ b/libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java
@@ -21,44 +21,44 @@ package org.apache.zest.library.uowfile;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
-import org.apache.zest.api.identity.HasIdentity;
-import org.apache.zest.api.identity.Identity;
-import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
-import org.apache.zest.spi.ZestSPI;
-import org.apache.zest.test.AbstractZestTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
 import org.apache.zest.api.concern.Concerns;
 import org.apache.zest.api.entity.EntityBuilder;
+import org.apache.zest.api.identity.HasIdentity;
+import org.apache.zest.api.identity.Identity;
 import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.injection.scope.This;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.api.unitofwork.UnitOfWork;
 import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
+import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
 import org.apache.zest.api.unitofwork.concern.UnitOfWorkConcern;
 import org.apache.zest.api.unitofwork.concern.UnitOfWorkPropagation;
 import org.apache.zest.api.unitofwork.concern.UnitOfWorkRetry;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.io.Inputs;
-import org.apache.zest.io.Outputs;
 import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
 import org.apache.zest.library.uowfile.bootstrap.UoWFileAssembler;
 import org.apache.zest.library.uowfile.internal.ConcurrentUoWFileModificationException;
 import org.apache.zest.library.uowfile.plural.HasUoWFilesLifecycle;
 import org.apache.zest.library.uowfile.plural.UoWFilesLocator;
+import org.apache.zest.spi.ZestSPI;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -188,7 +188,10 @@ public class HasUoWFilesTest
             File attachedFileTwo = entity.attachedFile( MyEnum.fileTwo );
             File managedFileOne = entity.managedFile( MyEnum.fileOne );
             // END SNIPPET: api
-            Inputs.text( MODIFICATION_CONTENT_URL ).transferTo( Outputs.text( managedFileOne ) );
+            try( InputStream input = MODIFICATION_CONTENT_URL.openStream() )
+            {
+                Files.copy( input, managedFileOne.toPath(), REPLACE_EXISTING );
+            }
         }
     }
 
@@ -346,11 +349,17 @@ public class HasUoWFilesTest
 
         uow = unitOfWorkFactory.newUnitOfWork();
         entity = uow.get( TestedEntity.class, entityId );
-        Inputs.text( MODIFICATION_CONTENT_URL ).transferTo( Outputs.text( entity.managedFile( MyEnum.fileOne ) ) );
+        try( InputStream input = MODIFICATION_CONTENT_URL.openStream() )
+        {
+            Files.copy( input, entity.managedFile( MyEnum.fileOne ).toPath(), REPLACE_EXISTING );
+        }
 
         uow2 = unitOfWorkFactory.newUnitOfWork();
         entity = uow2.get( TestedEntity.class, entityId );
-        Inputs.text( MODIFICATION_CONTENT_URL ).transferTo( Outputs.text( entity.managedFile( MyEnum.fileOne ) ) );
+        try( InputStream input = MODIFICATION_CONTENT_URL.openStream() )
+        {
+            Files.copy( input, entity.managedFile( MyEnum.fileOne ).toPath(), REPLACE_EXISTING );
+        }
 
         uow.complete();
         try
@@ -432,7 +441,10 @@ public class HasUoWFilesTest
         TestedEntity entity = builder.instance();
         entity.name().set( name );
         entity = builder.newInstance();
-        Inputs.text( CREATION_CONTENT_URL ).transferTo( Outputs.text( entity.managedFile( MyEnum.fileOne ) ) );
+        try( InputStream input = CREATION_CONTENT_URL.openStream() )
+        {
+            Files.copy( input, entity.managedFile( MyEnum.fileOne ).toPath() );
+        }
         return entity;
     }
 


[04/14] zest-java git commit: minor: javadocs

Posted by pa...@apache.org.
minor: javadocs


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

Branch: refs/heads/develop
Commit: 95c1b24cfe43e2d1fd6bc418e28cb594aceecfb0
Parents: 3e3a8f2
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 09:32:29 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 09:32:29 2016 +0100

----------------------------------------------------------------------
 .../api/association/AssociationStateHolder.java   | 18 +++++++++---------
 .../zest/test/mock/internal/MockResolver.java     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/95c1b24c/core/api/src/main/java/org/apache/zest/api/association/AssociationStateHolder.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/association/AssociationStateHolder.java b/core/api/src/main/java/org/apache/zest/api/association/AssociationStateHolder.java
index f4e8f07..b2e999d 100644
--- a/core/api/src/main/java/org/apache/zest/api/association/AssociationStateHolder.java
+++ b/core/api/src/main/java/org/apache/zest/api/association/AssociationStateHolder.java
@@ -30,7 +30,7 @@ public interface AssociationStateHolder
     extends StateHolder
 {
     /**
-     * Get an association for a specific accessor method
+     * Get an association for a specific accessor method.
      *
      * @param associationMethod for the association
      *
@@ -39,14 +39,14 @@ public interface AssociationStateHolder
     <T> Association<T> associationFor( AccessibleObject associationMethod );
 
     /**
-     * Get all associations
+     * Get all associations.
      *
-     * @return iterable of associations
+     * @return stream of associations
      */
     Stream<? extends Association<?>> allAssociations();
 
     /**
-     * Get a many-association for a specific accessor method
+     * Get a many-association for a specific accessor method.
      *
      * @param manyassociationMethod for the many-association
      *
@@ -55,14 +55,14 @@ public interface AssociationStateHolder
     <T> ManyAssociation<T> manyAssociationFor( AccessibleObject manyassociationMethod );
 
     /**
-     * Get all ManyAssociations
+     * Get all ManyAssociations.
      *
-     * @return iterable of many-associations
+     * @return stream of many-associations
      */
     Stream<? extends ManyAssociation<?>> allManyAssociations();
 
     /**
-     * Get a named-association for a specific accessor method
+     * Get a named-association for a specific accessor method.
      *
      * @param namedassociationMethod for the named-association
      *
@@ -71,9 +71,9 @@ public interface AssociationStateHolder
     <T> NamedAssociation<T> namedAssociationFor( AccessibleObject namedassociationMethod );
 
     /**
-     * Get all NmaedAssociations
+     * Get all named-associations.
      *
-     * @return iterable of named-associations
+     * @return stream of named-associations
      */
     Stream<? extends NamedAssociation<?>> allNamedAssociations();
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95c1b24c/core/testsupport/src/main/java/org/apache/zest/test/mock/internal/MockResolver.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/mock/internal/MockResolver.java b/core/testsupport/src/main/java/org/apache/zest/test/mock/internal/MockResolver.java
index 19029bb..72b5484 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/mock/internal/MockResolver.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/mock/internal/MockResolver.java
@@ -23,7 +23,7 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
 /**
- * Resolves the invocation handler for a registred mock. Actual matching method is specific to each implementation.
+ * Resolves the invocation handler for a registered mock. Actual matching method is specific to each implementation.
  */
 public interface MockResolver
 {


[07/14] zest-java git commit: restlet library: prefer Streams over core/functional

Posted by pa...@apache.org.
restlet library: prefer Streams over core/functional


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

Branch: refs/heads/develop
Commit: 88117d1c6c5593485bdf8cd466cb8407c3ef5fcc
Parents: ce93c2e
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 09:57:42 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 09:57:42 2016 +0100

----------------------------------------------------------------------
 .../library/restlet/identity/IdentityManager.java  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/88117d1c/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
index a9df076..0656e85 100644
--- a/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
+++ b/libraries/restlet/src/main/java/org/apache/zest/library/restlet/identity/IdentityManager.java
@@ -35,9 +35,6 @@ import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.unitofwork.concern.UnitOfWorkConcern;
 import org.apache.zest.api.unitofwork.concern.UnitOfWorkPropagation;
 
-import static org.apache.zest.functional.Iterables.filter;
-import static org.apache.zest.functional.Iterables.first;
-
 @Mixins( IdentityManager.Mixin.class )
 @Concerns( { UnitOfWorkConcern.class } )
 public interface IdentityManager
@@ -133,18 +130,14 @@ public interface IdentityManager
                 throw new InvalidIdentityFormatException( idString );
             }
             String prefix = idString.substring( 0, pos );
-            Map.Entry<String, String> found =
-                first(
-                    filter(
-                        new FindClassSpecification( prefix ),
-                        config.get().mapping().get().entrySet()
-                    )
-                );
+            Map.Entry<String, String> found = config.get().mapping().get().entrySet().stream()
+                                                    .filter( new FindClassSpecification( prefix ) )
+                                                    .findFirst().orElse( null );
             return found == null ? null : actualClasses.get( found.getKey() );
         }
 
         private static class FindClassSpecification
-            implements Predicate<Map.Entry<Class, String>>
+            implements Predicate<Map.Entry<String, String>>
         {
             private String prefix;
 
@@ -154,7 +147,7 @@ public interface IdentityManager
             }
 
             @Override
-            public boolean test( Map.Entry<Class, String> item )
+            public boolean test( Map.Entry<String, String> item )
             {
                 return item.getValue().equals( prefix );
             }


[08/14] zest-java git commit: minor: remove dead commented code and unused imports

Posted by pa...@apache.org.
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 <pa...@apache.org>
Authored: Mon Nov 28 10:40:44 2016 +0100
Committer: Paul Merlin <pa...@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;
     }
 }


[06/14] zest-java git commit: forum sample: prefer Streams over core/functional

Posted by pa...@apache.org.
forum sample: prefer Streams over core/functional


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

Branch: refs/heads/develop
Commit: ce93c2ee4b36902adf8fda2e8910082d060640a3
Parents: 94f7cca
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 09:55:34 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 09:55:34 2016 +0100

----------------------------------------------------------------------
 .../sample/forum/assembler/ForumAssembler.java  | 32 +++++++++++---------
 .../sample/forum/context/EventsService.java     | 15 +++------
 .../sample/forum/domainevent/DomainEvent.java   | 15 +++------
 3 files changed, 27 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/ce93c2ee/samples/forum/src/main/java/org/apache/zest/sample/forum/assembler/ForumAssembler.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/apache/zest/sample/forum/assembler/ForumAssembler.java b/samples/forum/src/main/java/org/apache/zest/sample/forum/assembler/ForumAssembler.java
index 6ef446f..d629d06 100644
--- a/samples/forum/src/main/java/org/apache/zest/sample/forum/assembler/ForumAssembler.java
+++ b/samples/forum/src/main/java/org/apache/zest/sample/forum/assembler/ForumAssembler.java
@@ -20,7 +20,7 @@
 package org.apache.zest.sample.forum.assembler;
 
 import java.lang.reflect.Modifier;
-
+import java.util.List;
 import org.apache.zest.api.common.Visibility;
 import org.apache.zest.api.entity.EntityComposite;
 import org.apache.zest.api.value.ValueComposite;
@@ -42,20 +42,20 @@ import org.apache.zest.library.rest.server.restlet.RequestReaderDelegator;
 import org.apache.zest.library.rest.server.restlet.ResponseWriterDelegator;
 import org.apache.zest.library.rest.server.spi.CommandResult;
 import org.apache.zest.sample.forum.context.Context;
-import org.apache.zest.sample.forum.domainevent.DomainCommandResult;
-import org.apache.zest.sample.forum.rest.resource.RootResource;
 import org.apache.zest.sample.forum.context.EventsService;
 import org.apache.zest.sample.forum.data.entity.User;
+import org.apache.zest.sample.forum.domainevent.DomainCommandResult;
 import org.apache.zest.sample.forum.domainevent.DomainEventValue;
 import org.apache.zest.sample.forum.domainevent.ParameterValue;
 import org.apache.zest.sample.forum.rest.ForumRestlet;
+import org.apache.zest.sample.forum.rest.resource.RootResource;
 import org.apache.zest.sample.forum.service.BootstrapData;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
 import org.restlet.service.MetadataService;
 
+import static java.util.stream.Collectors.toList;
 import static org.apache.zest.api.util.Classes.hasModifier;
 import static org.apache.zest.api.util.Classes.isAssignableFrom;
-import static org.apache.zest.functional.Iterables.filter;
 
 /**
  * TODO
@@ -103,17 +103,19 @@ public class ForumAssembler
         LayerAssembly data = assembly.layer( "Data" ).uses( infrastructure );
         {
             ModuleAssembly forum = data.module( "Forum" );
-            for( Class<?> dataClass : filter( hasModifier( Modifier.INTERFACE ), filter( isAssignableFrom( EntityComposite.class ), ClassScanner
-                .findClasses( User.class ) ) ) )
-            {
-                forum.entities( dataClass ).visibleIn( Visibility.application );
-            }
+            ClassScanner.findClasses( User.class )
+                        .filter( isAssignableFrom( EntityComposite.class ) )
+                        .filter( hasModifier( Modifier.INTERFACE ) )
+                        .forEach( dataClass -> forum.entities( dataClass ).visibleIn( Visibility.application ) );
         }
 
         LayerAssembly context = assembly.layer( "Context" ).uses( data );
         {
             ModuleAssembly contexts = context.module( "Context" );
-            for( Class<?> contextClass : filter( hasModifier( Modifier.INTERFACE ).negate(), ClassScanner.findClasses( Context.class ) ) )
+            List<? extends Class<?>> contextClasses = ClassScanner.findClasses( Context.class )
+                                                                  .filter( hasModifier( Modifier.INTERFACE ).negate() )
+                                                                  .collect( toList() );
+            for( Class<?> contextClass : contextClasses )
             {
                 if( contextClass.getName().contains( "$" ) )
                 {
@@ -125,10 +127,9 @@ public class ForumAssembler
                 }
             }
 
-            for( Class<?> valueClass : filter( isAssignableFrom( ValueComposite.class ), ClassScanner.findClasses( Context.class ) ) )
-            {
-                contexts.values( valueClass ).visibleIn( Visibility.application );
-            }
+            ClassScanner.findClasses( Context.class )
+                        .filter( isAssignableFrom( ValueComposite.class ) )
+                        .forEach( valueClass -> contexts.values( valueClass ).visibleIn( Visibility.application ) );
 
             contexts.services( EventsService.class );
 
@@ -159,7 +160,8 @@ public class ForumAssembler
             }
 
             ModuleAssembly resources = rest.module( "Resources" );
-            for( Class<?> resourceClass : ClassScanner.findClasses( RootResource.class ) )
+            List<? extends Class<?>> resourceClasses = ClassScanner.findClasses( RootResource.class ).collect( toList() );
+            for( Class<?> resourceClass : resourceClasses )
             {
                 resources.objects( resourceClass ).visibleIn( Visibility.layer );
             }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ce93c2ee/samples/forum/src/main/java/org/apache/zest/sample/forum/context/EventsService.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/apache/zest/sample/forum/context/EventsService.java b/samples/forum/src/main/java/org/apache/zest/sample/forum/context/EventsService.java
index db1410b..e8a9414 100644
--- a/samples/forum/src/main/java/org/apache/zest/sample/forum/context/EventsService.java
+++ b/samples/forum/src/main/java/org/apache/zest/sample/forum/context/EventsService.java
@@ -21,7 +21,6 @@ package org.apache.zest.sample.forum.context;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import java.util.function.Function;
 import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.service.ServiceComposite;
@@ -32,12 +31,13 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
 import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueBuilderFactory;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.library.rest.server.api.ObjectSelection;
 import org.apache.zest.sample.forum.domainevent.DomainEventValue;
 import org.apache.zest.sample.forum.domainevent.ParameterValue;
 import org.restlet.Request;
 
+import static java.util.stream.Collectors.toCollection;
+
 /**
  * TODO
  */
@@ -81,14 +81,9 @@ public interface EventsService
                 prototype.parameters().get().add( parameterBuilder.newInstance() );
             }
 
-            Iterables.addAll( prototype.selection().get(), Iterables.map( new Function<Object, String>()
-            {
-                @Override
-                public String apply( Object o )
-                {
-                    return o.toString();
-                }
-            }, ObjectSelection.current().selection() ) );
+            ObjectSelection.current().selection().stream()
+                           .map( Object::toString )
+                           .collect( toCollection( () -> prototype.selection().get() ) );
 
             final DomainEventValue domainEvent = builder.newInstance();
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/ce93c2ee/samples/forum/src/main/java/org/apache/zest/sample/forum/domainevent/DomainEvent.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/apache/zest/sample/forum/domainevent/DomainEvent.java b/samples/forum/src/main/java/org/apache/zest/sample/forum/domainevent/DomainEvent.java
index eae9ed9..df937fd 100644
--- a/samples/forum/src/main/java/org/apache/zest/sample/forum/domainevent/DomainEvent.java
+++ b/samples/forum/src/main/java/org/apache/zest/sample/forum/domainevent/DomainEvent.java
@@ -22,7 +22,6 @@ package org.apache.zest.sample.forum.domainevent;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
-import java.util.function.Function;
 import org.apache.zest.api.concern.Concerns;
 import org.apache.zest.api.concern.GenericConcern;
 import org.apache.zest.api.injection.scope.Structure;
@@ -33,10 +32,11 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
 import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.api.value.ValueBuilderFactory;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.library.rest.server.api.ObjectSelection;
 import org.restlet.Request;
 
+import static java.util.stream.Collectors.toCollection;
+
 /**
  * TODO
  */
@@ -82,14 +82,9 @@ public @interface DomainEvent
                 prototype.parameters().get().add( parameterBuilder.newInstance() );
             }
 
-            Iterables.addAll( prototype.selection().get(), Iterables.map( new Function<Object, String>()
-            {
-                @Override
-                public String apply( Object o )
-                {
-                    return o.toString();
-                }
-            }, ObjectSelection.current().selection() ) );
+            ObjectSelection.current().selection().stream()
+                           .map( Object::toString )
+                           .collect( toCollection( () -> prototype.selection().get() ) );
 
             final DomainEventValue domainEvent = builder.newInstance();
 


[12/14] zest-java git commit: introduce single() Collector, preferred over Iterables.single()

Posted by pa...@apache.org.
introduce single() Collector, preferred over Iterables.single()


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

Branch: refs/heads/develop
Commit: d7f000c987431cee7da87b8724e06ff96d5f864e
Parents: fdf596b
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 12:52:32 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 12:52:32 2016 +0100

----------------------------------------------------------------------
 .../org/apache/zest/api/util/Collectors.java    | 54 +++++++++++++++++
 .../apache/zest/api/util/CollectorsTest.java    | 64 ++++++++++++++++++++
 .../zest/test/cache/MemoryCachePoolMixin.java   |  4 +-
 .../zest/library/rest/common/Resource.java      |  9 +--
 .../library/rest/common/link/LinksUtil.java     |  9 +--
 5 files changed, 130 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/d7f000c9/core/api/src/main/java/org/apache/zest/api/util/Collectors.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/util/Collectors.java b/core/api/src/main/java/org/apache/zest/api/util/Collectors.java
new file mode 100644
index 0000000..c977059
--- /dev/null
+++ b/core/api/src/main/java/org/apache/zest/api/util/Collectors.java
@@ -0,0 +1,54 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.zest.api.util;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+public class Collectors
+{
+    /**
+     * Collect a single element.
+     * @param <T> Element type
+     * @return The single element
+     * @throws IllegalArgumentException if no or more than one element
+     */
+    public static <T> Collector<T, ?, T> single()
+        throws IllegalArgumentException
+    {
+        Supplier<T> thrower = () ->
+        {
+            throw new IllegalArgumentException( "No or more than one element in stream" );
+        };
+        return java.util.stream.Collectors.collectingAndThen( singleOrEmpty(),
+                                                              optional -> optional.orElseGet( thrower ) );
+    }
+
+    /**
+     * Collect an optional single element.
+     * @param <T> Element type
+     * @return An optional single element, empty if no or more than one element
+     */
+    public static <T> Collector<T, ?, Optional<T>> singleOrEmpty()
+    {
+        return java.util.stream.Collectors.reducing( ( a, b ) -> null );
+    }
+
+    private Collectors() {}
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d7f000c9/core/api/src/test/java/org/apache/zest/api/util/CollectorsTest.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/zest/api/util/CollectorsTest.java b/core/api/src/test/java/org/apache/zest/api/util/CollectorsTest.java
new file mode 100644
index 0000000..6aeb871
--- /dev/null
+++ b/core/api/src/test/java/org/apache/zest/api/util/CollectorsTest.java
@@ -0,0 +1,64 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.zest.api.util;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+public class CollectorsTest
+{
+    @Test
+    public void singleOrEmpty()
+    {
+        assertEquals( Optional.empty(), Stream.of().collect( Collectors.singleOrEmpty() ) );
+        assertEquals( Optional.of( 1 ), Stream.of( 1 ).collect( Collectors.singleOrEmpty() ) );
+        assertEquals( Optional.empty(), Stream.of( 1, 1 ).collect( Collectors.singleOrEmpty() ) );
+        assertEquals( Optional.empty(), Stream.of( 1, 1, 1 ).collect( Collectors.singleOrEmpty() ) );
+    }
+
+    @Test
+    public void single()
+    {
+        assertThat( Stream.of( 1L ).collect( Collectors.single() ), is( 1L ) );
+
+        try
+        {
+            Stream.of().collect( Collectors.single() );
+            fail( "Should have failed" );
+        }
+        catch( IllegalArgumentException ex ) {}
+        try
+        {
+            Stream.of( 1, 1 ).collect( Collectors.single() );
+            fail( "Should have failed" );
+        }
+        catch( IllegalArgumentException ex ) {}
+        try
+        {
+            Stream.of( 1, 1, 1 ).collect( Collectors.single() );
+            fail( "Should have failed" );
+        }
+        catch( IllegalArgumentException ex ) {}
+    }
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d7f000c9/core/testsupport/src/main/java/org/apache/zest/test/cache/MemoryCachePoolMixin.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/cache/MemoryCachePoolMixin.java b/core/testsupport/src/main/java/org/apache/zest/test/cache/MemoryCachePoolMixin.java
index 46fe8b6..e462127 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/cache/MemoryCachePoolMixin.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/cache/MemoryCachePoolMixin.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.zest.api.util.NullArgumentException;
 import org.apache.zest.spi.cache.Cache;
 
-import static org.apache.zest.functional.Iterables.single;
+import static org.apache.zest.api.util.Collectors.single;
 
 /**
  * In-Memory CachePool Mixin based on ConcurrentHashMap.
@@ -80,6 +80,6 @@ public abstract class MemoryCachePoolMixin
     @Override
     public MemoryCacheImpl<?> singleCache()
     {
-        return single( caches.values() );
+        return caches.values().stream().collect( single() );
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d7f000c9/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/Resource.java
----------------------------------------------------------------------
diff --git a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/Resource.java b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/Resource.java
index 5bd62f2..8e611d0 100644
--- a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/Resource.java
+++ b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/Resource.java
@@ -26,10 +26,11 @@ import org.apache.zest.api.common.UseDefaults;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.api.value.ValueComposite;
-import org.apache.zest.functional.Iterables;
 import org.apache.zest.library.rest.common.link.Link;
 import org.apache.zest.library.rest.common.link.LinksUtil;
 
+import static org.apache.zest.api.util.Collectors.single;
+
 /**
  * Value representing a whole resource in a URL path. Allows listing of available
  * queries, commands, sub-resources and an index.
@@ -62,19 +63,19 @@ public interface Resource
         @Override
         public Link query( String relation )
         {
-            return Iterables.single( Iterables.filter( LinksUtil.withRel( relation ), queries().get() ) );
+            return queries().get().stream().filter( LinksUtil.withRel( relation ) ).collect( single() );
         }
 
         @Override
         public Link command( String relation )
         {
-            return Iterables.single(Iterables.filter( LinksUtil.withRel( relation ), commands().get() ));
+            return commands().get().stream().filter( LinksUtil.withRel( relation ) ).collect( single() );
         }
 
         @Override
         public Link resource( String relation )
         {
-            return Iterables.single(Iterables.filter( LinksUtil.withRel( relation ), resources().get() ));
+            return resources().get().stream().filter( LinksUtil.withRel( relation ) ).collect( single() );
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/d7f000c9/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/link/LinksUtil.java
----------------------------------------------------------------------
diff --git a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/link/LinksUtil.java b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/link/LinksUtil.java
index 4f592a6..cfcc08d 100644
--- a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/link/LinksUtil.java
+++ b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/link/LinksUtil.java
@@ -22,7 +22,8 @@ package org.apache.zest.library.rest.common.link;
 
 import java.util.function.Function;
 import java.util.function.Predicate;
-import org.apache.zest.functional.Iterables;
+
+import static org.apache.zest.api.util.Collectors.single;
 
 /**
  * Helper methods for links
@@ -52,14 +53,14 @@ public final class LinksUtil
       };
    }
 
-    public static Link withRel(String rel, Links links)
+    public static Link withRel( String rel, Links links )
     {
-        return Iterables.single( Iterables.filter( withRel( rel ), links.links().get() ) );
+        return links.links().get().stream().filter( withRel( rel ) ).collect( single() );
     }
 
     public static Link withId(String id, Links links)
     {
-        return Iterables.single( Iterables.filter( withId( id ), links.links().get() ) );
+        return links.links().get().stream().filter( withId( id ) ).collect( single() );
     }
 
    public static Function<Link, String> toRel()


[13/14] zest-java git commit: get rid of org.apache.zest.runtime.legacy.Specifications

Posted by pa...@apache.org.
get rid of org.apache.zest.runtime.legacy.Specifications

and simplify


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

Branch: refs/heads/develop
Commit: b4c26443ad908f91bb5ab38fcc898b55d7fd722c
Parents: d7f000c
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 13:23:49 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 13:23:49 2016 +0100

----------------------------------------------------------------------
 .../org/apache/zest/api/util/Annotations.java   |  5 +++
 .../bootstrap/CompositeAssemblyImpl.java        | 19 ++++-------
 .../runtime/composite/ConstructorsModel.java    |  9 ++---
 .../zest/runtime/composite/MixinModel.java      |  2 +-
 .../zest/runtime/injection/DependencyModel.java | 11 ------
 .../runtime/injection/InjectedFieldsModel.java  | 11 +++---
 .../runtime/injection/InjectedMethodsModel.java |  6 ++--
 .../ServiceInjectionProviderFactory.java        |  7 ++--
 .../zest/runtime/legacy/Specifications.java     | 36 --------------------
 .../zest/runtime/service/ServiceModel.java      |  5 +--
 10 files changed, 26 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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 838f7e8..a5598d7 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
@@ -43,6 +43,11 @@ public final class Annotations
     public static final Function<Type, Stream<Annotation>> ANNOTATIONS_OF =
         Classes.forTypes( type -> Arrays.stream( Classes.RAW_CLASS.apply( type ).getAnnotations() ) );
 
+    public static Predicate<Annotation> typeHasAnnotation( Class<? extends Annotation> annotationType )
+    {
+        return element -> hasAnnotation( annotationType ).test( type().apply( element ) );
+    }
+
     public static Predicate<AnnotatedElement> hasAnnotation( final Class<? extends Annotation> annotationType )
     {
         return element -> element.getAnnotation( annotationType ) != null;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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 6f4bbbf..b0731c3 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
@@ -97,16 +97,14 @@ import org.apache.zest.runtime.property.PropertiesModel;
 import org.apache.zest.runtime.property.PropertyModel;
 
 import static java.util.stream.Stream.concat;
-import static org.apache.zest.api.util.Annotations.hasAnnotation;
 import static org.apache.zest.api.util.Annotations.isType;
-import static org.apache.zest.api.util.Annotations.type;
+import static org.apache.zest.api.util.Annotations.typeHasAnnotation;
 import static org.apache.zest.api.util.Classes.classHierarchy;
 import static org.apache.zest.api.util.Classes.interfacesOf;
 import static org.apache.zest.api.util.Classes.isAssignableFrom;
 import static org.apache.zest.api.util.Classes.typeOf;
 import static org.apache.zest.api.util.Classes.typesOf;
 import static org.apache.zest.api.util.Classes.wrapperClass;
-import static org.apache.zest.runtime.legacy.Specifications.translate;
 
 /**
  * Declaration of a Composite.
@@ -247,19 +245,16 @@ public abstract class CompositeAssemblyImpl
                         mixinsModel
                     );
 
-                    DependencyModel.InjectionTypeFunction injectionTypeFunction = new DependencyModel.InjectionTypeFunction();
-                    DependencyModel.ScopeSpecification thisSpec = new DependencyModel.ScopeSpecification( This.class );
                     Stream<? extends Dependencies> source = Stream.of( methodComposite, mixinModel );
                     source.flatMap( Dependencies::dependencies )
-                        .filter( thisSpec )
-                        .map( injectionTypeFunction )
-                        .forEach( thisDependencies::add );
+                          .filter( new DependencyModel.ScopeSpecification( This.class ) )
+                          .map( DependencyModel::rawInjectionType )
+                          .forEach( thisDependencies::add );
 
                     interfacesOf( mixinModel.mixinClass() )
                         .map( Classes.RAW_CLASS )
                         .filter( clazz -> Stream.of( Initializable.class, Lifecycle.class, InvocationHandler.class )
-                            .noneMatch( c -> c
-                                .equals( clazz ) ) )
+                                                .noneMatch( c -> c.equals( clazz ) ) )
                         .forEach( thisDependencies::add );
 
                     compositeMethodsModel.addMethod( methodComposite );
@@ -541,7 +536,7 @@ public abstract class CompositeAssemblyImpl
 
         List<AbstractConstraintModel> constraintModels = new ArrayList<>();
         List<Annotation> filtered = constraintAnnotations
-            .filter( translate( type(), hasAnnotation( ConstraintDeclaration.class ) ) )
+            .filter( typeHasAnnotation( ConstraintDeclaration.class ) )
             .collect( Collectors.toList() );
 
         // TODO: This massive block below should be cleaned up.
@@ -577,7 +572,7 @@ public abstract class CompositeAssemblyImpl
             // No implementation found!
             // Check if if it's a composite constraints
             if( Arrays.stream( annotationType.getAnnotations() )
-                .anyMatch( translate( type(), hasAnnotation( ConstraintDeclaration.class ) ) ) )
+                .anyMatch( typeHasAnnotation( ConstraintDeclaration.class ) ) )
             {
                 ValueConstraintsModel valueConstraintsModel = constraintsFor(
                     Arrays.stream( annotationType.getAnnotations() ),

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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 5608027..db6c2e1 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
@@ -30,14 +30,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 import org.apache.zest.api.common.ConstructionException;
 import org.apache.zest.api.composite.CompositeDescriptor;
 import org.apache.zest.api.composite.InvalidCompositeException;
 import org.apache.zest.api.injection.InjectionScope;
 import org.apache.zest.api.injection.scope.Uses;
-import org.apache.zest.api.util.Annotations;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.BindingException;
 import org.apache.zest.functional.HierarchicalVisitor;
@@ -48,10 +46,11 @@ import org.apache.zest.runtime.injection.DependencyModel;
 import org.apache.zest.runtime.injection.InjectedParametersModel;
 import org.apache.zest.runtime.injection.InjectionContext;
 import org.apache.zest.runtime.injection.ParameterizedTypeInstance;
-import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.runtime.model.Binder;
 import org.apache.zest.runtime.model.Resolution;
 
+import static org.apache.zest.api.util.Annotations.typeHasAnnotation;
+
 /**
  * JAVADOC
  */
@@ -129,10 +128,8 @@ public final class ConstructorsModel
         Annotation[][] parameterAnnotations = injectedConstructor.getParameterAnnotations();
         for( Type type : injectedConstructor.getGenericParameterTypes() )
         {
-            Predicate<Annotation> injectionAnnotationSpec = Specifications.translate(
-                Annotations.type(), Annotations.hasAnnotation( InjectionScope.class ) );
             Annotation injectionAnnotation = Stream.of( parameterAnnotations[ idx ] )
-                                                   .filter( injectionAnnotationSpec )
+                                                   .filter( typeHasAnnotation( InjectionScope.class ) )
                                                    .findFirst().orElse( null );
 
             if( injectionAnnotation == null )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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 9ce738b..cf6af21 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
@@ -159,7 +159,7 @@ public final class MixinModel
         return dependencies()
             .filter( new DependencyModel.ScopeSpecification( This.class ) )
             .distinct()
-            .map( new DependencyModel.InjectionTypeFunction() )
+            .map( DependencyModel::rawInjectionType )
             .collect( Collectors.toList() );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
index 23c5659..bc8f914 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java
@@ -26,7 +26,6 @@ import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import org.apache.zest.api.common.ConstructionException;
@@ -419,14 +418,4 @@ public final class DependencyModel
             return model.hasScope( scope );
         }
     }
-
-    public static class InjectionTypeFunction
-        implements Function<DependencyModel, Class<?>>
-    {
-        @Override
-        public Class<?> apply( DependencyModel dependencyModel )
-        {
-            return dependencyModel.rawInjectionType();
-        }
-    }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedFieldsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedFieldsModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedFieldsModel.java
index bcaf027..125e73a 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedFieldsModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/InjectedFieldsModel.java
@@ -28,6 +28,7 @@ import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Stream;
 import org.apache.zest.api.injection.InjectionScope;
 import org.apache.zest.api.util.Classes;
@@ -35,9 +36,7 @@ import org.apache.zest.api.util.Fields;
 import org.apache.zest.functional.HierarchicalVisitor;
 import org.apache.zest.functional.VisitableHierarchy;
 
-import static org.apache.zest.api.util.Annotations.hasAnnotation;
-import static org.apache.zest.api.util.Annotations.type;
-import static org.apache.zest.runtime.legacy.Specifications.translate;
+import static org.apache.zest.api.util.Annotations.typeHasAnnotation;
 
 /**
  * JAVADOC
@@ -51,9 +50,9 @@ public final class InjectedFieldsModel
     {
         Fields.fieldsOf( fragmentClass ).forEach( field ->
             Arrays.stream( field.getAnnotations() )
-                .filter( translate( type(), hasAnnotation( InjectionScope.class ) ) )
-                .filter( annot -> annot != null )
-                .forEach( injectionAnnotation ->  addModel( fragmentClass, field, injectionAnnotation )
+                  .filter( typeHasAnnotation( InjectionScope.class ) )
+                  .filter( Objects::nonNull )
+                  .forEach( injectionAnnotation ->  addModel( fragmentClass, field, injectionAnnotation )
             )
         );
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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 4615c0c..b303ea6 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
@@ -30,14 +30,12 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 import org.apache.zest.api.injection.InjectionScope;
-import org.apache.zest.api.util.Annotations;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.api.util.Methods;
 import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.functional.VisitableHierarchy;
 
-import static org.apache.zest.api.util.Annotations.hasAnnotation;
+import static org.apache.zest.api.util.Annotations.typeHasAnnotation;
 
 /**
  * JAVADOC
@@ -60,7 +58,7 @@ public final class InjectedMethodsModel
                 for( int i = 0; i < parameterAnnotations.length; i++ )
                 {
                     Optional<Annotation> opt = Arrays.stream( parameterAnnotations[ i ] )
-                        .filter( Specifications.translate( Annotations.type(), hasAnnotation( InjectionScope.class ) ) )
+                        .filter( typeHasAnnotation( InjectionScope.class ) )
                         .findFirst();
                     if( opt.isPresent() )
                     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
index 9d0ed4f..85817d2 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java
@@ -29,7 +29,6 @@ import java.util.stream.Stream;
 import org.apache.zest.api.service.NoSuchServiceException;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.service.qualifier.Qualifier;
-import org.apache.zest.api.util.Annotations;
 import org.apache.zest.api.util.Classes;
 import org.apache.zest.bootstrap.InvalidInjectionException;
 import org.apache.zest.functional.Iterables;
@@ -37,10 +36,9 @@ import org.apache.zest.runtime.injection.DependencyModel;
 import org.apache.zest.runtime.injection.InjectionContext;
 import org.apache.zest.runtime.injection.InjectionProvider;
 import org.apache.zest.runtime.injection.InjectionProviderFactory;
-import org.apache.zest.runtime.legacy.Specifications;
 import org.apache.zest.runtime.model.Resolution;
 
-import static org.apache.zest.api.util.Annotations.hasAnnotation;
+import static org.apache.zest.api.util.Annotations.typeHasAnnotation;
 
 public final class ServiceInjectionProviderFactory
     implements InjectionProviderFactory
@@ -52,8 +50,7 @@ public final class ServiceInjectionProviderFactory
     {
         // TODO This could be changed to allow multiple @Qualifier annotations
         Annotation qualifierAnnotation = Stream.of( dependencyModel.annotations() )
-                                               .filter( Specifications.translate( Annotations.type(),
-                                                                                  hasAnnotation( Qualifier.class ) ) )
+                                               .filter( typeHasAnnotation( Qualifier.class ) )
                                                .findFirst().orElse( null );
         Predicate<ServiceReference<?>> serviceQualifier = null;
         if( qualifierAnnotation != null )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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
deleted file mode 100644
index ac2491e..0000000
--- a/core/runtime/src/main/java/org/apache/zest/runtime/legacy/Specifications.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *
- */
-package org.apache.zest.runtime.legacy;
-
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-/**
- * Common generic specification expressions
- */
-public class Specifications
-{
-    public static <FROM, TO> Predicate<FROM> translate( final Function<FROM, TO> function,
-                                                        final Predicate<? super TO> specification
-    )
-    {
-        return item -> specification.test( function.apply( item ) );
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b4c26443/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 5e9e1c0..2083c94 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
@@ -49,8 +49,6 @@ import org.apache.zest.runtime.injection.DependencyModel;
 import org.apache.zest.runtime.injection.InjectionContext;
 import org.apache.zest.runtime.property.PropertyInstance;
 
-import static org.apache.zest.runtime.legacy.Specifications.translate;
-
 /**
  * JAVADOC
  */
@@ -171,8 +169,7 @@ public final class ServiceModel extends CompositeModel
     public Class calculateConfigurationType()
     {
         DependencyModel.ScopeSpecification thisSpec = new DependencyModel.ScopeSpecification( This.class );
-        Predicate<DependencyModel> configurationCheck =
-            translate( new DependencyModel.InjectionTypeFunction(), clazz -> clazz.equals( Configuration.class ) );
+        Predicate<DependencyModel> configurationCheck = item -> item.rawInjectionType().equals( Configuration.class );
         return dependencies().filter( thisSpec.and( configurationCheck ) )
             .filter( dependencyModel -> dependencyModel.rawInjectionType().equals( Configuration.class ) )
             .filter( dependencyModel -> dependencyModel.injectionType() instanceof ParameterizedType )


[10/14] zest-java git commit: rest library: fix wrong return type

Posted by pa...@apache.org.
rest library: fix wrong return type


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

Branch: refs/heads/develop
Commit: c7fe187470242a944e8797109469da51bfff2e98
Parents: 3acd801
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Nov 28 11:31:31 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Nov 28 11:33:38 2016 +0100

----------------------------------------------------------------------
 .../apache/zest/library/rest/server/api/ObjectSelection.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/c7fe1874/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ObjectSelection.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ObjectSelection.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ObjectSelection.java
index fe7e4dc..3fb146a 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ObjectSelection.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ObjectSelection.java
@@ -21,6 +21,7 @@
 package org.apache.zest.library.rest.server.api;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.zest.functional.Iterables;
 import org.restlet.Request;
@@ -80,9 +81,9 @@ public class ObjectSelection
         throw new IllegalArgumentException( "No object in selection for type:" + type.getSimpleName() );
     }
 
-    public Iterable<Object> selection()
+    public List<Object> selection()
     {
-        return selection;
+        return Collections.unmodifiableList(selection);
     }
 
     public Object[] toArray()


[02/14] zest-java git commit: build: use mavenCentral() instead of jcenter() in buildSrc

Posted by pa...@apache.org.
build: use mavenCentral() instead of jcenter() in buildSrc

Using the same repository as the actual build will speed things up a bit


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

Branch: refs/heads/develop
Commit: d74b36945f70798e11c96e6b7b7c61366d2fdaf4
Parents: 927d444
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 27 10:35:25 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 27 10:35:25 2016 +0100

----------------------------------------------------------------------
 buildSrc/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/d74b3694/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index ff2dde8..b7d1b16 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -20,7 +20,7 @@
 
 repositories {
   maven { url "https://plugins.gradle.org/m2/" }
-  jcenter()
+  mavenCentral()
 }
 
 dependencies {