[#1236] wip: trying to remove Spring warnings

samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/WebApp.java

@@ -27,10 +27,12 @@
 import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -41,10 +43,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * NOPMD
- */
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @ControllerAdvice
 @SpringBootApplication
 public class WebApp {
@@ -73,6 +73,7 @@ public String handleException(AuthorizationException e, Model model) {
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     public Realm realm() {
         TextConfigurationRealm realm = new TextConfigurationRealm();
         realm.setUserDefinitions("joe.coder=password,user\n" + "jill.coder=password,admin");
@@ -83,6 +84,7 @@ public Realm realm() {
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     public ShiroFilterChainDefinition shiroFilterChainDefinition() {
         DefaultShiroFilterChainDefinition chainDefinition = new DefaultShiroFilterChainDefinition();
         // need to accept POSTs from the login form

support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAnnotationProcessorAutoConfiguration.java

@@ -23,23 +23,25 @@
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Role;
 
 /**
  * @since 1.4.0
  */
 @SuppressWarnings("SpringFacetCodeInspection")
 @AutoConfigureAfter(AopAutoConfiguration.class)
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @ConditionalOnProperty(name = "shiro.annotations.enabled", matchIfMissing = true)
 public class ShiroAnnotationProcessorAutoConfiguration extends AbstractShiroAnnotationProcessorConfiguration {
-
     @Bean
     @DependsOn("lifecycleBeanPostProcessor")
     @ConditionalOnMissingBean(name = AopConfigUtils.AUTO_PROXY_CREATOR_BEAN_NAME)
@@ -50,6 +52,7 @@ public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() {
 
     @Bean
     @ConditionalOnMissingBean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @Override
     public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager) {
         return super.authorizationAttributeSourceAdvisor(securityManager);

support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroAutoConfiguration.java

@@ -31,22 +31,24 @@
 import org.apache.shiro.session.mgt.eis.SessionDAO;
 import org.apache.shiro.spring.boot.autoconfigure.exception.NoRealmBeanConfiguredException;
 import org.apache.shiro.spring.config.AbstractShiroConfiguration;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 
 import java.util.List;
 
 /**
  * @since 1.4.0
  */
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @SuppressWarnings("SpringFacetCodeInspection")
 @ConditionalOnProperty(name = "shiro.enabled", matchIfMissing = true)
 public class ShiroAutoConfiguration extends AbstractShiroConfiguration {
-
     @Bean
     @ConditionalOnMissingBean
     @Override

support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/boot/autoconfigure/ShiroBeanAutoConfiguration.java

@@ -22,33 +22,38 @@
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.config.AbstractShiroBeanConfiguration;
 import org.apache.shiro.spring.ShiroEventBusBeanPostProcessor;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 
 /**
  * @since 1.4.0
  */
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @ConditionalOnProperty(name = "shiro.enabled", matchIfMissing = true)
 public class ShiroBeanAutoConfiguration extends AbstractShiroBeanConfiguration {
-
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
         return super.lifecycleBeanPostProcessor();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected EventBus eventBus() {
         return super.eventBus();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     public ShiroEventBusBeanPostProcessor shiroEventBusAwareBeanPostProcessor() {

support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java

@@ -37,123 +37,140 @@
 import org.apache.shiro.spring.web.config.AbstractShiroWebConfiguration;
 import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.apache.shiro.web.servlet.Cookie;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 
 /**
  * @since 1.4.0
  */
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @AutoConfigureBefore(ShiroAutoConfiguration.class)
 @AutoConfigureAfter(ShiroWebMvcAutoConfiguration.class)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnProperty(name = "shiro.web.enabled", matchIfMissing = true)
 public class ShiroWebAutoConfiguration extends AbstractShiroWebConfiguration {
-
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected AuthenticationStrategy authenticationStrategy() {
         return super.authenticationStrategy();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected Authenticator authenticator() {
         return super.authenticator();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected Authorizer authorizer() {
         return super.authorizer();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SubjectDAO subjectDAO() {
         return super.subjectDAO();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SessionStorageEvaluator sessionStorageEvaluator() {
         return super.sessionStorageEvaluator();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SubjectFactory subjectFactory() {
         return super.subjectFactory();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SessionFactory sessionFactory() {
         return super.sessionFactory();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SessionDAO sessionDAO() {
         return super.sessionDAO();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SessionManager sessionManager() {
         return super.sessionManager();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected SessionsSecurityManager securityManager(List<Realm> realms) {
         return super.securityManager(realms);
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean(name = "sessionCookieTemplate")
     @Override
     protected Cookie sessionCookieTemplate() {
         return super.sessionCookieTemplate();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected RememberMeManager rememberMeManager() {
         return super.rememberMeManager();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean(name = "rememberMeCookieTemplate")
     @Override
     protected Cookie rememberMeCookieTemplate() {
         return super.rememberMeCookieTemplate();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected ShiroFilterChainDefinition shiroFilterChainDefinition() {
         return super.shiroFilterChainDefinition();
     }
 
     @Bean
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     @Override
     protected ShiroUrlPathHelper shiroUrlPathHelper() {

support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java

@@ -21,12 +21,14 @@
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.spring.web.config.AbstractShiroWebFilterConfiguration;
 import org.apache.shiro.web.servlet.AbstractShiroFilter;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 
 import javax.servlet.DispatcherType;
 import java.util.List;
@@ -37,6 +39,7 @@
 @Configuration
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnProperty(name = "shiro.web.enabled", matchIfMissing = true)
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ShiroWebFilterConfiguration extends AbstractShiroWebFilterConfiguration {
 
     /**
@@ -70,6 +73,7 @@ protected FilterRegistrationBean<AbstractShiroFilter> filterShiroFilterRegistrat
     }
 
     @Bean(name = "globalFilters")
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @ConditionalOnMissingBean
     protected List<String> globalFilters() {
         return super.globalFilters();

support/spring/src/main/java/org/apache/shiro/spring/config/ShiroBeanConfiguration.java

@@ -21,29 +21,35 @@
 import org.apache.shiro.event.EventBus;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.ShiroEventBusBeanPostProcessor;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 
 /**
  * @since 1.4.0
  */
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ShiroBeanConfiguration extends AbstractShiroBeanConfiguration {
 
     @Bean
     @Override
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
         return super.lifecycleBeanPostProcessor();
     }
 
     @Bean
     @Override
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     protected EventBus eventBus() {
         return super.eventBus();
     }
 
     @Bean
     @Override
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     public ShiroEventBusBeanPostProcessor shiroEventBusAwareBeanPostProcessor() {
         return super.shiroEventBusAwareBeanPostProcessor();
     }

support/spring/src/main/java/org/apache/shiro/spring/config/ShiroConfiguration.java

@@ -30,17 +30,20 @@
 import org.apache.shiro.session.mgt.SessionFactory;
 import org.apache.shiro.session.mgt.SessionManager;
 import org.apache.shiro.session.mgt.eis.SessionDAO;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Role;
 
 import java.util.List;
 
 /**
  * @since 1.4.0
  */
 @Configuration
-@Import({ShiroBeanConfiguration.class})
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+@Import(ShiroBeanConfiguration.class)
 public class ShiroConfiguration extends AbstractShiroConfiguration {
 
 

support/spring/src/main/java/org/apache/shiro/spring/web/config/ShiroWebConfiguration.java

@@ -32,15 +32,18 @@
 import org.apache.shiro.session.mgt.eis.SessionDAO;
 import org.apache.shiro.spring.web.ShiroUrlPathHelper;
 import org.apache.shiro.web.servlet.Cookie;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Role;
 
 import java.util.List;
 
 /**
  * @since 1.4.0
  */
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ShiroWebConfiguration extends AbstractShiroWebConfiguration {
 
     @Bean