polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [22/50] [abbrv] zest-qi4j git commit: Removed Function, Function2 and Specification and replaced with the equivalents in JDK, Function, BiFunction and Predicate.
Date Fri, 17 Apr 2015 16:08:34 GMT
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/ConstraintViolationInterceptor.java
----------------------------------------------------------------------
diff --git a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/ConstraintViolationInterceptor.java
b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/ConstraintViolationInterceptor.java
index a099cbf..dabbc35 100644
--- a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/ConstraintViolationInterceptor.java
+++ b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/ConstraintViolationInterceptor.java
@@ -148,7 +148,7 @@ public class ConstraintViolationInterceptor
         if( target instanceof Composite )
         {
             Composite composite = (Composite) target;
-            types = Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types();
+            types = Qi4j.FUNCTION_DESCRIPTOR_FOR.apply( composite ).types();
         }
         else
         {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameFilters.java
----------------------------------------------------------------------
diff --git a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameFilters.java
b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameFilters.java
index 3d41cdf..b24b916 100644
--- a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameFilters.java
+++ b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameFilters.java
@@ -9,7 +9,7 @@ public final class ClassNameFilters
     public static ClassNameMapper passThruMapper = new ClassNameMapper()
     {
         @Override
-        public String map( Class<?> type )
+        public String apply( Class<?> type )
         {
             return type.getName();
         }
@@ -20,7 +20,7 @@ public final class ClassNameFilters
         return new ClassNameMapper()
         {
             @Override
-            public String map( Class<?> type )
+            public String apply( Class<?> type )
             {
                 String className = type.getName();
                 for( String suffix : suffixes )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameMapper.java
----------------------------------------------------------------------
diff --git a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameMapper.java
b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameMapper.java
index 93f3a8f..0b16b9a 100644
--- a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameMapper.java
+++ b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNameMapper.java
@@ -3,10 +3,10 @@
  */
 package org.qi4j.library.struts2.util;
 
-import org.qi4j.functional.Function;
+import java.util.function.Function;
 
 public interface ClassNameMapper extends Function<Class<?>,String>
 {
     @Override
-    String map( Class<?> type );
+    String apply( Class<?> type );
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNames.java
----------------------------------------------------------------------
diff --git a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNames.java
b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNames.java
index 69e3ae8..4def699 100644
--- a/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNames.java
+++ b/libraries/struts2-plugin/src/main/java/org/qi4j/library/struts2/util/ClassNames.java
@@ -1,7 +1,7 @@
 package org.qi4j.library.struts2.util;
 
 import java.util.Arrays;
-import org.qi4j.functional.Function;
+import java.util.function.Function;
 import org.qi4j.functional.Iterables;
 
 import static java.lang.Character.isLowerCase;

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
index d4dca15..ef55bf8 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
@@ -17,6 +17,7 @@
  */
 package org.qi4j.sample.dcicargo.sample_a.bootstrap.assembly;
 
+import java.util.function.Function;
 import org.qi4j.api.structure.Application;
 import org.qi4j.api.structure.Module;
 import org.qi4j.api.value.ValueSerialization;
@@ -27,7 +28,6 @@ import org.qi4j.bootstrap.AssemblyException;
 import org.qi4j.bootstrap.LayerAssembly;
 import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.entitystore.memory.MemoryEntityStoreService;
-import org.qi4j.functional.Function;
 import org.qi4j.index.rdf.RdfIndexingEngineService;
 import org.qi4j.library.rdf.entity.EntityStateSerializer;
 import org.qi4j.library.rdf.entity.EntityTypeSerializer;
@@ -255,7 +255,7 @@ public class Assembler
             .setMetaInfo( new Function<Application, Module>()
         {
             @Override
-            public Module map( Application application )
+            public Module apply( Application application )
             {
                 return application.findModule( "CONTEXT", "CONTEXT-ContextSupport" );
             }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
index 64ec55d..58f6215 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/qi4j/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import org.qi4j.api.association.AssociationDescriptor;
 import org.qi4j.api.association.AssociationStateHolder;
 import org.qi4j.api.association.ManyAssociation;
@@ -38,7 +39,6 @@ import org.qi4j.api.value.NoSuchValueException;
 import org.qi4j.api.value.ValueBuilder;
 import org.qi4j.api.value.ValueBuilderFactory;
 import org.qi4j.api.value.ValueDescriptor;
-import org.qi4j.functional.Function;
 import org.qi4j.functional.Iterables;
 import org.qi4j.library.conversion.values.Unqualified;
 import org.qi4j.spi.Qi4jSPI;
@@ -90,7 +90,7 @@ public interface EntityToDTOService
                 builder = vbf.newValueBuilderWithState( valueType, new Function<PropertyDescriptor,
Object>()
                 {
                     @Override
-                    public Object map( PropertyDescriptor descriptor )
+                    public Object apply( PropertyDescriptor descriptor )
                     {
                         try
                         {
@@ -149,7 +149,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, EntityReference>()
                 {
                     @Override
-                    public EntityReference map( AssociationDescriptor associationDescriptor
)
+                    public EntityReference apply( AssociationDescriptor associationDescriptor
)
                     {
                         return EntityReference.entityReferenceFor(
                             associationState.associationFor( associationDescriptor.accessor()
).get() );
@@ -157,7 +157,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Iterable<EntityReference>>()
                 {
                     @Override
-                    public Iterable<EntityReference> map( AssociationDescriptor associationDescriptor
)
+                    public Iterable<EntityReference> apply( AssociationDescriptor associationDescriptor
)
                     {
                         ManyAssociation<?> state = associationState.manyAssociationFor(
associationDescriptor.accessor() );
                         List<EntityReference> refs = new ArrayList<>( state.count()
);
@@ -170,7 +170,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Map<String, EntityReference>>()
                 {
                     @Override
-                    public Map<String, EntityReference> map( AssociationDescriptor
from )
+                    public Map<String, EntityReference> apply( AssociationDescriptor
from )
                     {
                         // No NamedAssociation support
                         return Collections.emptyMap();
@@ -182,7 +182,7 @@ public interface EntityToDTOService
                 builder = vbf.newValueBuilderWithState( valueType, new Function<PropertyDescriptor,
Object>()
                 {
                     @Override
-                    public Object map( PropertyDescriptor descriptor )
+                    public Object apply( PropertyDescriptor descriptor )
                     {
                         try
                         {
@@ -266,7 +266,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, EntityReference>()
                 {
                     @Override
-                    public EntityReference map( AssociationDescriptor descriptor )
+                    public EntityReference apply( AssociationDescriptor descriptor )
                     {
                         AssociationDescriptor associationDescriptor;
                         try
@@ -285,7 +285,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Iterable<EntityReference>>()
                 {
                     @Override
-                    public Iterable<EntityReference> map( AssociationDescriptor descriptor
)
+                    public Iterable<EntityReference> apply( AssociationDescriptor descriptor
)
                     {
                         AssociationDescriptor associationDescriptor;
                         try
@@ -309,7 +309,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Map<String, EntityReference>>()
                 {
                     @Override
-                    public Map<String, EntityReference> map( AssociationDescriptor
from )
+                    public Map<String, EntityReference> apply( AssociationDescriptor
from )
                     {
                         // No NamedAssociations support
                         return Collections.emptyMap();

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/dci-cargo/dcisample_a/src/test/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/test/TestAssembler.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/test/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/test/TestAssembler.java
b/samples/dci-cargo/dcisample_a/src/test/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/test/TestAssembler.java
index f2ac4a1..67c2ca3 100644
--- a/samples/dci-cargo/dcisample_a/src/test/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/test/TestAssembler.java
+++ b/samples/dci-cargo/dcisample_a/src/test/java/org/qi4j/sample/dcicargo/sample_a/bootstrap/test/TestAssembler.java
@@ -17,6 +17,7 @@
  */
 package org.qi4j.sample.dcicargo.sample_a.bootstrap.test;
 
+import java.util.function.Function;
 import org.qi4j.api.structure.Application;
 import org.qi4j.api.structure.Module;
 import org.qi4j.api.value.ValueSerialization;
@@ -27,7 +28,6 @@ import org.qi4j.bootstrap.AssemblyException;
 import org.qi4j.bootstrap.LayerAssembly;
 import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.entitystore.memory.MemoryEntityStoreService;
-import org.qi4j.functional.Function;
 import org.qi4j.index.rdf.RdfIndexingEngineService;
 import org.qi4j.library.rdf.entity.EntityStateSerializer;
 import org.qi4j.library.rdf.entity.EntityTypeSerializer;
@@ -189,7 +189,7 @@ public class TestAssembler
             .setMetaInfo( new Function<Application, Module>()
         {
             @Override
-            public Module map( Application application )
+            public Module apply( Application application )
             {
                 return application.findModule( "CONTEXT", "CONTEXT-ContextSupport" );
             }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java
b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java
index ce354db..b2c25a3 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/assembly/Assembler.java
@@ -17,6 +17,7 @@
  */
 package org.qi4j.sample.dcicargo.sample_b.bootstrap.assembly;
 
+import java.util.function.Function;
 import org.qi4j.api.structure.Application;
 import org.qi4j.api.structure.Module;
 import org.qi4j.api.value.ValueSerialization;
@@ -27,7 +28,6 @@ import org.qi4j.bootstrap.AssemblyException;
 import org.qi4j.bootstrap.LayerAssembly;
 import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.entitystore.memory.MemoryEntityStoreService;
-import org.qi4j.functional.Function;
 import org.qi4j.index.rdf.RdfIndexingEngineService;
 import org.qi4j.library.rdf.entity.EntityStateSerializer;
 import org.qi4j.library.rdf.entity.EntityTypeSerializer;
@@ -260,7 +260,7 @@ public class Assembler
             .setMetaInfo( new Function<Application, Module>()
         {
             @Override
-            public Module map( Application application )
+            public Module apply( Application application )
             {
                 return application.findModule( "CONTEXT", "CONTEXT-RoleMap" );
             }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/EntityToDTOService.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/EntityToDTOService.java
b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/EntityToDTOService.java
index 50adef3..73d217b 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/EntityToDTOService.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/infrastructure/conversion/EntityToDTOService.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import org.qi4j.api.association.AssociationDescriptor;
 import org.qi4j.api.association.AssociationStateHolder;
 import org.qi4j.api.association.ManyAssociation;
@@ -38,7 +39,6 @@ import org.qi4j.api.value.NoSuchValueException;
 import org.qi4j.api.value.ValueBuilder;
 import org.qi4j.api.value.ValueBuilderFactory;
 import org.qi4j.api.value.ValueDescriptor;
-import org.qi4j.functional.Function;
 import org.qi4j.functional.Iterables;
 import org.qi4j.library.conversion.values.Unqualified;
 import org.qi4j.spi.Qi4jSPI;
@@ -90,7 +90,7 @@ public interface EntityToDTOService
                 builder = vbf.newValueBuilderWithState( valueType, new Function<PropertyDescriptor,
Object>()
                 {
                     @Override
-                    public Object map( PropertyDescriptor descriptor )
+                    public Object apply( PropertyDescriptor descriptor )
                     {
                         try
                         {
@@ -152,7 +152,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, EntityReference>()
                 {
                     @Override
-                    public EntityReference map( AssociationDescriptor associationDescriptor
)
+                    public EntityReference apply( AssociationDescriptor associationDescriptor
)
                     {
                         return EntityReference.entityReferenceFor(
                             associationState.associationFor( associationDescriptor.accessor()
).get() );
@@ -160,7 +160,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Iterable<EntityReference>>()
                 {
                     @Override
-                    public Iterable<EntityReference> map( AssociationDescriptor associationDescriptor
)
+                    public Iterable<EntityReference> apply( AssociationDescriptor associationDescriptor
)
                     {
                         ManyAssociation<?> state = associationState.manyAssociationFor(
associationDescriptor.accessor() );
                         List<EntityReference> refs = new ArrayList<>( state.count()
);
@@ -173,7 +173,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Map<String, EntityReference>>()
                 {
                     @Override
-                    public Map<String, EntityReference> map( AssociationDescriptor
from )
+                    public Map<String, EntityReference> apply( AssociationDescriptor
from )
                     {
                         throw new UnsupportedOperationException( "NamedAssociations are not
supported." );
                     }
@@ -184,7 +184,7 @@ public interface EntityToDTOService
                 builder = vbf.newValueBuilderWithState( valueType, new Function<PropertyDescriptor,
Object>()
                 {
                     @Override
-                    public Object map( PropertyDescriptor descriptor )
+                    public Object apply( PropertyDescriptor descriptor )
                     {
                         try
                         {
@@ -268,7 +268,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, EntityReference>()
                 {
                     @Override
-                    public EntityReference map( AssociationDescriptor descriptor )
+                    public EntityReference apply( AssociationDescriptor descriptor )
                     {
                         AssociationDescriptor associationDescriptor;
                         try
@@ -287,7 +287,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Iterable<EntityReference>>()
                 {
                     @Override
-                    public Iterable<EntityReference> map( AssociationDescriptor descriptor
)
+                    public Iterable<EntityReference> apply( AssociationDescriptor descriptor
)
                     {
                         AssociationDescriptor associationDescriptor;
                         try
@@ -311,7 +311,7 @@ public interface EntityToDTOService
                 }, new Function<AssociationDescriptor, Map<String, EntityReference>>()
                 {
                     @Override
-                    public Map<String, EntityReference> map( AssociationDescriptor
from )
+                    public Map<String, EntityReference> apply( AssociationDescriptor
from )
                     {
                         throw new UnsupportedOperationException( "NamedAssociations are not
supported." );
                     }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/dci-cargo/dcisample_b/src/test/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/test/TestAssembler.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/test/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/test/TestAssembler.java
b/samples/dci-cargo/dcisample_b/src/test/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/test/TestAssembler.java
index 639ec7b..fce9203 100644
--- a/samples/dci-cargo/dcisample_b/src/test/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/test/TestAssembler.java
+++ b/samples/dci-cargo/dcisample_b/src/test/java/org/qi4j/sample/dcicargo/sample_b/bootstrap/test/TestAssembler.java
@@ -17,6 +17,7 @@
  */
 package org.qi4j.sample.dcicargo.sample_b.bootstrap.test;
 
+import java.util.function.Function;
 import org.qi4j.api.structure.Application;
 import org.qi4j.api.structure.Module;
 import org.qi4j.api.value.ValueSerialization;
@@ -27,7 +28,6 @@ import org.qi4j.bootstrap.AssemblyException;
 import org.qi4j.bootstrap.LayerAssembly;
 import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.entitystore.memory.MemoryEntityStoreService;
-import org.qi4j.functional.Function;
 import org.qi4j.index.rdf.RdfIndexingEngineService;
 import org.qi4j.library.rdf.entity.EntityStateSerializer;
 import org.qi4j.library.rdf.entity.EntityTypeSerializer;
@@ -194,7 +194,7 @@ public class TestAssembler
             .setMetaInfo( new Function<Application, Module>()
         {
             @Override
-            public Module map( Application application )
+            public Module apply( Application application )
             {
                 return application.findModule( "CONTEXT", "CONTEXT-RoleMap" );
             }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/forum/src/main/java/org/qi4j/samples/forum/assembler/ForumAssembler.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/qi4j/samples/forum/assembler/ForumAssembler.java
b/samples/forum/src/main/java/org/qi4j/samples/forum/assembler/ForumAssembler.java
index 807886d..b010fe3 100644
--- a/samples/forum/src/main/java/org/qi4j/samples/forum/assembler/ForumAssembler.java
+++ b/samples/forum/src/main/java/org/qi4j/samples/forum/assembler/ForumAssembler.java
@@ -1,6 +1,7 @@
 package org.qi4j.samples.forum.assembler;
 
 import java.lang.reflect.Modifier;
+import java.util.function.Function;
 import org.qi4j.api.common.Visibility;
 import org.qi4j.api.entity.EntityComposite;
 import org.qi4j.api.structure.Application;
@@ -16,7 +17,6 @@ import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.entitystore.memory.MemoryEntityStoreService;
 import org.qi4j.entitystore.neo4j.NeoConfiguration;
 import org.qi4j.entitystore.neo4j.NeoEntityStoreService;
-import org.qi4j.functional.Function;
 import org.qi4j.library.fileconfig.FileConfigurationService;
 import org.qi4j.library.rest.common.ValueAssembler;
 import org.qi4j.library.rest.server.assembler.RestServerAssembler;
@@ -75,7 +75,7 @@ public class ForumAssembler
                 withValuesModuleFinder( new Function<Application, Module>()
             {
                 @Override
-                public Module map( Application app )
+                public Module apply( Application app )
                 {
                     return app.findModule( "REST", "Values" );
                 }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/forum/src/main/java/org/qi4j/samples/forum/context/Context.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/qi4j/samples/forum/context/Context.java b/samples/forum/src/main/java/org/qi4j/samples/forum/context/Context.java
index 120c2b3..92edaad 100644
--- a/samples/forum/src/main/java/org/qi4j/samples/forum/context/Context.java
+++ b/samples/forum/src/main/java/org/qi4j/samples/forum/context/Context.java
@@ -20,6 +20,6 @@ public class Context
 
     protected <T> T role( Object object, Class<T> roleType )
     {
-        return Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( (Composite) object ).newProxy( roleType
);
+        return Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.apply( (Composite) object ).newProxy(
roleType );
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/forum/src/main/java/org/qi4j/samples/forum/context/EventsService.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/qi4j/samples/forum/context/EventsService.java
b/samples/forum/src/main/java/org/qi4j/samples/forum/context/EventsService.java
index c040b2a..a1ef7e5 100644
--- a/samples/forum/src/main/java/org/qi4j/samples/forum/context/EventsService.java
+++ b/samples/forum/src/main/java/org/qi4j/samples/forum/context/EventsService.java
@@ -2,6 +2,7 @@ package org.qi4j.samples.forum.context;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.util.function.Function;
 import org.qi4j.api.injection.scope.Structure;
 import org.qi4j.api.mixin.Mixins;
 import org.qi4j.api.service.ServiceComposite;
@@ -11,7 +12,6 @@ import org.qi4j.api.unitofwork.UnitOfWork;
 import org.qi4j.api.unitofwork.UnitOfWorkCallback;
 import org.qi4j.api.unitofwork.UnitOfWorkCompletionException;
 import org.qi4j.api.value.ValueBuilder;
-import org.qi4j.functional.Function;
 import org.qi4j.functional.Iterables;
 import org.qi4j.library.rest.server.api.ObjectSelection;
 import org.qi4j.samples.forum.domainevent.DomainEventValue;
@@ -60,7 +60,7 @@ public interface EventsService
             Iterables.addAll( prototype.selection().get(), Iterables.map( new Function<Object,
String>()
             {
                 @Override
-                public String map( Object o )
+                public String apply( Object o )
                 {
                     return o.toString();
                 }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/forum/src/main/java/org/qi4j/samples/forum/domainevent/DomainEvent.java
----------------------------------------------------------------------
diff --git a/samples/forum/src/main/java/org/qi4j/samples/forum/domainevent/DomainEvent.java
b/samples/forum/src/main/java/org/qi4j/samples/forum/domainevent/DomainEvent.java
index ee96bd9..137a529 100644
--- a/samples/forum/src/main/java/org/qi4j/samples/forum/domainevent/DomainEvent.java
+++ b/samples/forum/src/main/java/org/qi4j/samples/forum/domainevent/DomainEvent.java
@@ -3,6 +3,7 @@ package org.qi4j.samples.forum.domainevent;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
+import java.util.function.Function;
 import org.qi4j.api.concern.Concerns;
 import org.qi4j.api.concern.GenericConcern;
 import org.qi4j.api.injection.scope.Structure;
@@ -12,7 +13,6 @@ import org.qi4j.api.unitofwork.UnitOfWork;
 import org.qi4j.api.unitofwork.UnitOfWorkCallback;
 import org.qi4j.api.unitofwork.UnitOfWorkCompletionException;
 import org.qi4j.api.value.ValueBuilder;
-import org.qi4j.functional.Function;
 import org.qi4j.functional.Iterables;
 import org.qi4j.library.rest.server.api.ObjectSelection;
 import org.restlet.Request;
@@ -62,7 +62,7 @@ public @interface DomainEvent
             Iterables.addAll( prototype.selection().get(), Iterables.map( new Function<Object,
String>()
             {
                 @Override
-                public String map( Object o )
+                public String apply( Object o )
                 {
                     return o.toString();
                 }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/rental/src/main/java/org/qi4j/sample/rental/web/Page.java
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/java/org/qi4j/sample/rental/web/Page.java b/samples/rental/src/main/java/org/qi4j/sample/rental/web/Page.java
index 30d9d5b..b808d89 100644
--- a/samples/rental/src/main/java/org/qi4j/sample/rental/web/Page.java
+++ b/samples/rental/src/main/java/org/qi4j/sample/rental/web/Page.java
@@ -90,7 +90,7 @@ public interface Page
             throws RenderException
         {
             Class<? extends Composite> compositeType = (Class<Composite>) first(
Qi4j.FUNCTION_DESCRIPTOR_FOR
-                                                                                     .map(
context.page() )
+                                                                                     .apply(
context.page() )
                                                                                      .types()
);
             try
             {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java b/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java
index 0c4a1dc..7a1af8f 100644
--- a/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java
+++ b/samples/rental/src/main/java/org/qi4j/sample/rental/web/QuikitServlet.java
@@ -194,8 +194,8 @@ public class QuikitServlet
     private void renderPage( Page page, String path, PrintWriter output, HttpServletRequest
httpRequest )
         throws ParserConfigurationException, SAXException, IOException, RenderException,
TransformerException
     {
-        Class<? extends Composite> pageClass = (Class<Composite>) first( Qi4j.FUNCTION_DESCRIPTOR_FOR
-                                                                             .map( page ).types()
);
+        Class<? extends Composite> pageClass =
+            (Class<Composite>) first( Qi4j.FUNCTION_DESCRIPTOR_FOR.apply( page ).types()
);
 
         String pageName = pageClass.getSimpleName() + ".html";
         DocumentBuilder documentBuilder = documentFactory.newDocumentBuilder();

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/9479a63e/samples/rental/src/main/java/org/qi4j/sample/rental/web/assembly/StorageModule.java
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/java/org/qi4j/sample/rental/web/assembly/StorageModule.java
b/samples/rental/src/main/java/org/qi4j/sample/rental/web/assembly/StorageModule.java
index 71212cc..1288e3e 100644
--- a/samples/rental/src/main/java/org/qi4j/sample/rental/web/assembly/StorageModule.java
+++ b/samples/rental/src/main/java/org/qi4j/sample/rental/web/assembly/StorageModule.java
@@ -17,6 +17,7 @@
  */
 package org.qi4j.sample.rental.web.assembly;
 
+import java.util.function.Function;
 import org.qi4j.api.common.Visibility;
 import org.qi4j.api.structure.Application;
 import org.qi4j.api.structure.Module;
@@ -24,7 +25,6 @@ import org.qi4j.bootstrap.Assembler;
 import org.qi4j.bootstrap.AssemblyException;
 import org.qi4j.bootstrap.ModuleAssembly;
 import org.qi4j.entitystore.memory.MemoryEntityStoreService;
-import org.qi4j.functional.Function;
 import org.qi4j.spi.uuid.UuidIdentityGeneratorService;
 import org.qi4j.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
 
@@ -43,7 +43,7 @@ public class StorageModule
             withValuesModuleFinder( new Function<Application, Module>()
         {
             @Override
-            public Module map( Application app )
+            public Module apply( Application app )
             {
                 return app.findModule( "DomainLayer", "RentalModule" );
             }


Mime
View raw message