From commits-return-48571-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Wed Jan 31 21:31:02 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 91DA8180662 for ; Wed, 31 Jan 2018 21:31:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7C08F160C42; Wed, 31 Jan 2018 20:31:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C5128160C2C for ; Wed, 31 Jan 2018 21:31:01 +0100 (CET) Received: (qmail 98333 invoked by uid 500); 31 Jan 2018 20:31:01 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 98324 invoked by uid 99); 31 Jan 2018 20:31:00 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Jan 2018 20:31:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CE7F381FCC; Wed, 31 Jan 2018 20:30:59 +0000 (UTC) Date: Wed, 31 Jan 2018 20:30:59 +0000 To: "commits@cxf.apache.org" Subject: [cxf] branch master updated: [CXF-7525] simplified forEach MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151743065976.32424.5144162230885365940@gitbox.apache.org> From: deki@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2aecfa9dbfb208e54bd9fd905470e5c2c863ed1a X-Git-Newrev: 8cd828eaf0e1070a0a5f6544cb26e8ed9c6fe8cd X-Git-Rev: 8cd828eaf0e1070a0a5f6544cb26e8ed9c6fe8cd X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new 8cd828e [CXF-7525] simplified forEach 8cd828e is described below commit 8cd828eaf0e1070a0a5f6544cb26e8ed9c6fe8cd Author: Dennis Kieselhorst AuthorDate: Wed Jan 31 21:18:51 2018 +0100 [CXF-7525] simplified forEach --- .../java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java | 10 +++++----- .../main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java index 3486f4a..4f033fc 100644 --- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java +++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java @@ -90,10 +90,10 @@ public class OpenApiCustomizer { }); List tags = new ArrayList<>(); - oas.getPaths().entrySet().forEach(entry -> { + oas.getPaths().forEach((pathKey, pathItem) -> { Tag tag = null; - if (replaceTags && operations.containsKey(entry.getKey())) { - ClassResourceInfo cri = operations.get(entry.getKey()); + if (replaceTags && operations.containsKey(pathKey)) { + ClassResourceInfo cri = operations.get(pathKey); tag = new Tag(); tag.setName(cri.getURITemplate().getValue().replaceAll("/", "_")); @@ -106,12 +106,12 @@ public class OpenApiCustomizer { } } - for (Map.Entry subentry : entry.getValue().readOperationsMap().entrySet()) { + for (Map.Entry subentry : pathItem.readOperationsMap().entrySet()) { if (replaceTags && tag != null) { subentry.getValue().setTags(Collections.singletonList(tag.getName())); } - Pair key = Pair.of(subentry.getKey().name(), entry.getKey()); + Pair key = Pair.of(subentry.getKey().name(), pathKey); if (methods.containsKey(key) && javadocProvider != null) { OperationResourceInfo ori = methods.get(key); diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java index abfbe00..ef6f2f3 100644 --- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java +++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java @@ -535,8 +535,7 @@ public class OpenApiFeature extends AbstractFeature implements SwaggerUiSupport, boolean hasComponents = false; if (securityDefinitions != null && !securityDefinitions.isEmpty()) { - securityDefinitions.entrySet().forEach(entry -> - components.addSecuritySchemes(entry.getKey(), entry.getValue())); + securityDefinitions.forEach((key, value) -> components.addSecuritySchemes(key, value)); hasComponents |= true; } -- To stop receiving notification emails like this one, please contact deki@apache.org.