Return-Path: X-Original-To: apmail-commonsrdf-commits-archive@minotaur.apache.org Delivered-To: apmail-commonsrdf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5BEA194E8 for ; Mon, 28 Mar 2016 17:45:53 +0000 (UTC) Received: (qmail 3726 invoked by uid 500); 28 Mar 2016 17:45:53 -0000 Delivered-To: apmail-commonsrdf-commits-archive@commonsrdf.apache.org Received: (qmail 3696 invoked by uid 500); 28 Mar 2016 17:45:53 -0000 Mailing-List: contact commits-help@commonsrdf.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commonsrdf.incubator.apache.org Delivered-To: mailing list commits@commonsrdf.incubator.apache.org Received: (qmail 3685 invoked by uid 99); 28 Mar 2016 17:45:53 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Mar 2016 17:45:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 16C401A56F9 for ; Mon, 28 Mar 2016 17:45:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id aq0LEX7sXIXl for ; Mon, 28 Mar 2016 17:45:51 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id C33A85FB2A for ; Mon, 28 Mar 2016 17:45:50 +0000 (UTC) Received: (qmail 3467 invoked by uid 99); 28 Mar 2016 17:45:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Mar 2016 17:45:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11D43E020D; Mon, 28 Mar 2016 17:45:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stain@apache.org To: commits@commonsrdf.incubator.apache.org Date: Mon, 28 Mar 2016 17:45:51 -0000 Message-Id: In-Reply-To: <75adfafd130e48ceb94460644a6b38da@git.apache.org> References: <75adfafd130e48ceb94460644a6b38da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-commonsrdf git commit: RDFSyntax - Java 8 style stream in byMediaType/byFileExtension RDFSyntax - Java 8 style stream in byMediaType/byFileExtension Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/2ef97f16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/2ef97f16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/2ef97f16 Branch: refs/heads/rdfsyntax-enum Commit: 2ef97f1627d3c3d11865abb4a533d55f487699d9 Parents: c896bf7 Author: Stian Soiland-Reyes Authored: Mon Mar 28 18:42:04 2016 +0100 Committer: Stian Soiland-Reyes Committed: Mon Mar 28 18:45:17 2016 +0100 ---------------------------------------------------------------------- .../org/apache/commons/rdf/api/RDFSyntax.java | 26 +++++++------------- 1 file changed, 9 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2ef97f16/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java b/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java index 9148cd2..84e1ca7 100644 --- a/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java +++ b/api/src/main/java/org/apache/commons/rdf/api/RDFSyntax.java @@ -17,6 +17,7 @@ */ package org.apache.commons.rdf.api; +import java.util.Arrays; import java.util.Locale; import java.util.Optional; @@ -153,15 +154,10 @@ public enum RDFSyntax { * no matching syntax was found. */ public static Optional byMediaType(String mediaType) { - mediaType = mediaType.toLowerCase(Locale.ENGLISH); - mediaType = mediaType.split("\\s*[;,]")[0]; - - for (RDFSyntax syntax : RDFSyntax.values()) { - if (mediaType.equals(syntax.mediaType)) { - return Optional.of(syntax); - } - } - return Optional.empty(); + final String type = mediaType.toLowerCase(Locale.ENGLISH). + split("\\s*[;,]", 2)[0]; + return Arrays.stream(RDFSyntax.values()).filter( + t -> t.mediaType.equals(type)).findAny(); } /** @@ -178,14 +174,10 @@ public enum RDFSyntax { * {@link Optional#empty()} indicating that no matching file * extension was found. */ - public static Optional byFileExtension(String fileExtension) { - fileExtension = fileExtension.toLowerCase(Locale.ENGLISH); - for (RDFSyntax syntax : RDFSyntax.values()) { - if (fileExtension.equals(syntax.fileExtension)) { - return Optional.of(syntax); - } - } - return Optional.empty(); + public static Optional byFileExtension(String fileExtension) { + final String ext = fileExtension.toLowerCase(Locale.ENGLISH); + return Arrays.stream(RDFSyntax.values()).filter( + t -> t.fileExtension.equals(ext)).findAny(); } }