Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4BAC5200D15 for ; Thu, 5 Oct 2017 19:26:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4AD511609D2; Thu, 5 Oct 2017 17:26:06 +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 91C801609E2 for ; Thu, 5 Oct 2017 19:26:05 +0200 (CEST) Received: (qmail 28895 invoked by uid 500); 5 Oct 2017 17:26:04 -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 28886 invoked by uid 99); 5 Oct 2017 17:26:04 -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; Thu, 05 Oct 2017 17:26:04 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CAFE881A55; Thu, 5 Oct 2017 17:26:01 +0000 (UTC) Date: Thu, 05 Oct 2017 17:26:01 +0000 To: "commits@cxf.apache.org" Subject: [cxf] branch 3.1.x-fixes updated: [CXF-7524] Correctly accessing the runAsFilter property, patch from David J. M. Karlsen applied, This closes #317 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150722436184.26732.17326955705703097863@gitbox.apache.org> From: sergeyb@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/3.1.x-fixes X-Git-Reftype: branch X-Git-Oldrev: 81855630937d3d3461a5cbe80866af94e8b3dcf0 X-Git-Newrev: 6e7a80a4659987baf77ebacaad0c476409dde153 X-Git-Rev: 6e7a80a4659987baf77ebacaad0c476409dde153 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Thu, 05 Oct 2017 17:26:06 -0000 This is an automated email from the ASF dual-hosted git repository. sergeyb pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.1.x-fixes by this push: new 6e7a80a [CXF-7524] Correctly accessing the runAsFilter property, patch from David J. M. Karlsen applied, This closes #317 6e7a80a is described below commit 6e7a80a4659987baf77ebacaad0c476409dde153 Author: Sergey Beryozkin AuthorDate: Thu Oct 5 18:20:45 2017 +0100 [CXF-7524] Correctly accessing the runAsFilter property, patch from David J. M. Karlsen applied, This closes #317 --- .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java index e6ea436..ec0960a 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java @@ -95,8 +95,6 @@ public class Swagger2Feature extends AbstractSwaggerFeature { private static final String USE_PATH_CFG_PROPERTY = "use.path.based.config"; private static final String SUPPORT_UI_PROPERTY = "support.swagger.ui"; - private boolean runAsFilter; - private boolean scanAllResources; private String ignoreRoutes; @@ -156,7 +154,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature { swaggerResources.add(apiListingResource); List providers = new ArrayList<>(); - if (runAsFilter) { + if (isRunAsFilter()) { providers.add(new SwaggerContainerRequestFilter(appInfo == null ? null : appInfo.getProvider())); } @@ -166,7 +164,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature { swaggerUiVersion); if (swaggerUiRoot != null) { SwaggerUIService swaggerUiService = new SwaggerUIService(swaggerUiRoot, swaggerUiMediaTypes); - if (!runAsFilter) { + if (!isRunAsFilter()) { swaggerResources.add(swaggerUiService); } else { providers.add(new SwaggerUIServiceFilter(swaggerUiService)); @@ -180,7 +178,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature { sfb.setResourceClassesFromBeans(swaggerResources); List cris = sfb.getClassResourceInfo(); - if (!runAsFilter) { + if (!isRunAsFilter()) { for (ClassResourceInfo cri : cris) { if (ApiListingResource.class.isAssignableFrom(cri.getResourceClass())) { InjectionUtils.injectContextProxies(cri, apiListingResource); -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].