Minor edits, imports, variable names, simplify expressions
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/e029f9ba Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/e029f9ba Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/e029f9ba Branch: refs/heads/develop Commit: e029f9ba5f9c5fe10eb8e4f35caef6aa1faa6fc6 Parents: 76b5be2 Author: Paul Merlin <[email protected]> Authored: Mon Apr 10 12:10:17 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon Apr 10 12:13:22 2017 +0200 ---------------------------------------------------------------------- .../org/apache/polygene/api/util/Classes.java | 40 ++++++++++---------- .../apache/polygene/api/util/Collectors.java | 2 +- .../runtime/composite/CompositeMethodModel.java | 19 +++------- .../runtime/defaults/UseDefaultsTest.java | 5 +-- 4 files changed, 27 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/e029f9ba/core/api/src/main/java/org/apache/polygene/api/util/Classes.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/polygene/api/util/Classes.java b/core/api/src/main/java/org/apache/polygene/api/util/Classes.java index 175be95..49ead26 100644 --- a/core/api/src/main/java/org/apache/polygene/api/util/Classes.java +++ b/core/api/src/main/java/org/apache/polygene/api/util/Classes.java @@ -50,32 +50,32 @@ import static java.util.stream.StreamSupport.stream; */ public final class Classes { - private final static Map<Type, Type> wrapperClasses = new HashMap<>(); + private final static Map<Type, Type> WRAPPER_CLASSES = new HashMap<>(); static { - wrapperClasses.put( boolean.class, Boolean.class ); - wrapperClasses.put( byte.class, Byte.class ); - wrapperClasses.put( short.class, Short.class ); - wrapperClasses.put( char.class, Character.class ); - wrapperClasses.put( int.class, Integer.class ); - wrapperClasses.put( long.class, Long.class ); - wrapperClasses.put( float.class, Float.class ); - wrapperClasses.put( double.class, Double.class ); + WRAPPER_CLASSES.put( boolean.class, Boolean.class ); + WRAPPER_CLASSES.put( byte.class, Byte.class ); + WRAPPER_CLASSES.put( short.class, Short.class ); + WRAPPER_CLASSES.put( char.class, Character.class ); + WRAPPER_CLASSES.put( int.class, Integer.class ); + WRAPPER_CLASSES.put( long.class, Long.class ); + WRAPPER_CLASSES.put( float.class, Float.class ); + WRAPPER_CLASSES.put( double.class, Double.class ); } - private final static Map<Type, Type> primitiveClasses = new HashMap<>(); + private final static Map<Type, Type> PRIMITIVE_CLASSES = new HashMap<>(); static { - primitiveClasses.put( boolean.class, Boolean.class ); - primitiveClasses.put( byte.class, Byte.class ); - primitiveClasses.put( short.class, Short.class ); - primitiveClasses.put( char.class, Character.class ); - primitiveClasses.put( int.class, Integer.class ); - primitiveClasses.put( long.class, Long.class ); - primitiveClasses.put( float.class, Float.class ); - primitiveClasses.put( double.class, Double.class ); + PRIMITIVE_CLASSES.put( boolean.class, Boolean.class ); + PRIMITIVE_CLASSES.put( byte.class, Byte.class ); + PRIMITIVE_CLASSES.put( short.class, Short.class ); + PRIMITIVE_CLASSES.put( char.class, Character.class ); + PRIMITIVE_CLASSES.put( int.class, Integer.class ); + PRIMITIVE_CLASSES.put( long.class, Long.class ); + PRIMITIVE_CLASSES.put( float.class, Float.class ); + PRIMITIVE_CLASSES.put( double.class, Double.class ); } /** @@ -84,7 +84,7 @@ public final class Classes * to ensure that they are not primitives. */ private static final Function<Type, Type> WRAPPER_CLASS = clazz -> { - Type wrapperClass = wrapperClasses.get( clazz ); + Type wrapperClass = WRAPPER_CLASSES.get( clazz ); return wrapperClass == null ? clazz : wrapperClass; }; @@ -95,7 +95,7 @@ public final class Classes */ @SuppressWarnings( "UnusedDeclaration" ) private static final Function<Type, Type> PRIMITIVE_CLASS = aClass -> { - Type primitiveClass = primitiveClasses.get( aClass ); + Type primitiveClass = PRIMITIVE_CLASSES.get( aClass ); return primitiveClass == null ? aClass : primitiveClass; }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/e029f9ba/core/api/src/main/java/org/apache/polygene/api/util/Collectors.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/polygene/api/util/Collectors.java b/core/api/src/main/java/org/apache/polygene/api/util/Collectors.java index 906b062..c3045cc 100644 --- a/core/api/src/main/java/org/apache/polygene/api/util/Collectors.java +++ b/core/api/src/main/java/org/apache/polygene/api/util/Collectors.java @@ -201,7 +201,7 @@ public class Collectors Function<? super T, ? extends U> valueMapper, Supplier<M> mapSupplier ) { - return java.util.stream.Collector + return Collector .of( mapSupplier, ( map, entry ) -> map.put( keyMapper.apply( entry ), valueMapper.apply( entry ) ), http://git-wip-us.apache.org/repos/asf/polygene-java/blob/e029f9ba/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodModel.java index 4d21359..e2eded4 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodModel.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodModel.java @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.polygene.api.common.ConstructionException; @@ -100,11 +99,7 @@ public final class CompositeMethodModel @SuppressWarnings( "unchecked" ) public Stream<DependencyModel> dependencies() { - Stream<? extends Dependencies> fragments = Stream.of( this.concerns, sideEffects ); - Stream<? extends Dependencies> nonNullFragments = fragments.filter( Objects::nonNull ); - Function<? super Dependencies, Stream<? extends DependencyModel>> dependencies = Dependencies::dependencies; - Stream<DependencyModel> modelStream = nonNullFragments.flatMap( dependencies ); - return modelStream; + return Stream.of( concerns, sideEffects ).filter( Objects::nonNull ).flatMap( Dependencies::dependencies ); } // Context @@ -223,13 +218,9 @@ public final class CompositeMethodModel try { MixinModel model = mixins.mixinFor( method ); - if( Genericpredicate.INSTANCE.test( model.mixinClass() ) ) - { - return false; - } - return ( model.mixinClass() - .getMethod( method.getName(), method.getParameterTypes() ) - .isAnnotationPresent( annotationClass ) ); + return !Genericpredicate.INSTANCE.test( model.mixinClass() ) + && ( model.mixinClass().getMethod( method.getName(), method.getParameterTypes() ) + .isAnnotationPresent( annotationClass ) ); } catch( NoSuchMethodException e ) { @@ -268,7 +259,7 @@ public final class CompositeMethodModel public Annotation[] getAnnotations() { // Add mixin annotations - List<Annotation> annotations = new ArrayList<Annotation>(); + List<Annotation> annotations = new ArrayList<>(); MixinModel model = mixins.mixinFor( method ); Annotation[] mixinAnnotations = new Annotation[ 0 ]; if( !Genericpredicate.INSTANCE.test( model.mixinClass() ) ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/e029f9ba/core/runtime/src/test/java/org/apache/polygene/runtime/defaults/UseDefaultsTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/defaults/UseDefaultsTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/defaults/UseDefaultsTest.java index a2dc6b3..2bc7b34 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/defaults/UseDefaultsTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/defaults/UseDefaultsTest.java @@ -27,9 +27,7 @@ import java.util.Map; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.common.UseDefaults; import org.apache.polygene.api.composite.TransientBuilder; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.property.Property; -import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; import org.junit.Test; @@ -44,8 +42,8 @@ import static org.junit.Assert.assertTrue; */ public class UseDefaultsTest extends AbstractPolygeneTest { + @Override public void assemble( ModuleAssembly module ) - throws AssemblyException { module.transients( TestComposite.class ); module.forMixin( TestComposite.class ).declareDefaults().assemblyString().set( "habba" ); @@ -92,7 +90,6 @@ public class UseDefaultsTest extends AbstractPolygeneTest } interface TestComposite - extends TransientComposite { @Optional Property<Integer> nullInt();
