From commits-return-3237-apmail-shiro-commits-archive=shiro.apache.org@shiro.apache.org Thu Sep 3 19:18:17 2020 Return-Path: X-Original-To: apmail-shiro-commits-archive@www.apache.org Delivered-To: apmail-shiro-commits-archive@www.apache.org Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with ESMTP id 87ADC1ABA6 for ; Thu, 3 Sep 2020 19:18:17 +0000 (UTC) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 3C1F4121C6D for ; Thu, 3 Sep 2020 19:18:17 +0000 (UTC) Received: (qmail 90425 invoked by uid 500); 3 Sep 2020 19:18:17 -0000 Delivered-To: apmail-shiro-commits-archive@shiro.apache.org Received: (qmail 90411 invoked by uid 500); 3 Sep 2020 19:18:17 -0000 Mailing-List: contact commits-help@shiro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@shiro.apache.org Delivered-To: mailing list commits@shiro.apache.org Received: (qmail 90402 invoked by uid 99); 3 Sep 2020 19:18:17 -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, 03 Sep 2020 19:18:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DB8908087C; Thu, 3 Sep 2020 19:18:16 +0000 (UTC) Date: Thu, 03 Sep 2020 19:18:16 +0000 To: "commits@shiro.apache.org" Subject: [shiro] branch 1.6.x updated: Add name to ShiroFilter's @ConditionalOnMissingBean MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159916069676.26304.1033868889767264162@gitbox.apache.org> From: fpapon@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: shiro X-Git-Refname: refs/heads/1.6.x X-Git-Reftype: branch X-Git-Oldrev: d7d36a6daf0b1c3c848ec82adb41a7cc56c35e60 X-Git-Newrev: 886569d38ba40ec8555b88084b4f2c4778ca7ab1 X-Git-Rev: 886569d38ba40ec8555b88084b4f2c4778ca7ab1 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. fpapon pushed a commit to branch 1.6.x in repository https://gitbox.apache.org/repos/asf/shiro.git The following commit(s) were added to refs/heads/1.6.x by this push: new 886569d Add name to ShiroFilter's @ConditionalOnMissingBean new ea680b4 Merge pull request #255 from ricardolsmendes/add-name-shirofilter-conditional 886569d is described below commit 886569d38ba40ec8555b88084b4f2c4778ca7ab1 Author: Ricardo Mendes AuthorDate: Wed Aug 26 15:46:56 2020 -0300 Add name to ShiroFilter's @ConditionalOnMissingBean Closes [SHIRO-792] --- .../web/autoconfigure/ShiroWebFilterConfiguration.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java b/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java index 9a60a0c..81a11ec 100644 --- a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java +++ b/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java @@ -37,6 +37,9 @@ import java.util.List; @ConditionalOnProperty(name = "shiro.web.enabled", matchIfMissing = true) public class ShiroWebFilterConfiguration extends AbstractShiroWebFilterConfiguration { + public static final String REGISTRATION_BEAN_NAME = "filterShiroFilterRegistrationBean"; + public static final String FILTER_NAME = "shiroFilter"; + @Bean @ConditionalOnMissingBean @Override @@ -44,13 +47,14 @@ public class ShiroWebFilterConfiguration extends AbstractShiroWebFilterConfigura return super.shiroFilterFactoryBean(); } - @Bean(name = "filterShiroFilterRegistrationBean") - @ConditionalOnMissingBean - protected FilterRegistrationBean filterShiroFilterRegistrationBean() throws Exception { + @Bean(name = REGISTRATION_BEAN_NAME) + @ConditionalOnMissingBean(name = REGISTRATION_BEAN_NAME) + protected FilterRegistrationBean filterShiroFilterRegistrationBean() throws Exception { - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>(); filterRegistrationBean.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.ERROR); filterRegistrationBean.setFilter((AbstractShiroFilter) shiroFilterFactoryBean().getObject()); + filterRegistrationBean.setName(FILTER_NAME); filterRegistrationBean.setOrder(1); return filterRegistrationBean;