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 <[email protected]> Authored: Mon Nov 28 09:57:42 2016 +0100 Committer: Paul Merlin <[email protected]> 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 ); }
