Merge pull request #103 from kakawait/refactor/rename-autoconfigure-p…

…ackage Rename autoconfigure package
kakawait · Jul 3, 2018 · b1ebabf · b1ebabf
2 parents 1f3a93f + 25d62f5
commit b1ebabf
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 38 deletions.
diff --git a/...rtionUserDetailsServiceConfiguration.java → ...rtionUserDetailsServiceConfiguration.java b/...rtionUserDetailsServiceConfiguration.java → ...rtionUserDetailsServiceConfiguration.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import com.kakawait.spring.security.cas.userdetails.GrantedAuthoritiesFromAssertionAttributesWithDefaultRolesUserDetailsService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

diff --git a/...as/CasAuthenticationFilterConfigurer.java → ...re/CasAuthenticationFilterConfigurer.java b/...as/CasAuthenticationFilterConfigurer.java → ...re/CasAuthenticationFilterConfigurer.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import lombok.Setter;
 import lombok.experimental.Accessors;

diff --git a/...uthenticationProviderSecurityBuilder.java → ...uthenticationProviderSecurityBuilder.java b/...uthenticationProviderSecurityBuilder.java → ...uthenticationProviderSecurityBuilder.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import com.kakawait.spring.security.cas.authentication.DynamicProxyCallbackUrlCasAuthenticationProvider;
 import lombok.Setter;

diff --git a/...curity/cas/CasHttpSecurityConfigurer.java → ...oconfigure/CasHttpSecurityConfigurer.java b/...curity/cas/CasHttpSecurityConfigurer.java → ...oconfigure/CasHttpSecurityConfigurer.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import lombok.NonNull;
 import org.jasig.cas.client.session.SingleSignOutFilter;

diff --git a/...ity/cas/CasSecurityAutoConfiguration.java → ...nfigure/CasSecurityAutoConfiguration.java b/...ity/cas/CasSecurityAutoConfiguration.java → ...nfigure/CasSecurityAutoConfiguration.java
@@ -1,6 +1,6 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
-import com.kakawait.spring.boot.security.cas.SpringBoot1CasHttpSecurityConfigurerAdapter.SpringBoot1SecurityProperties;
+import com.kakawait.spring.boot.security.cas.autoconfigure.SpringBoot1CasHttpSecurityConfigurerAdapter.SpringBoot1SecurityProperties;
 import com.kakawait.spring.security.cas.LaxServiceProperties;
 import com.kakawait.spring.security.cas.client.ticket.AttributePrincipalProxyTicketProvider;
 import com.kakawait.spring.security.cas.client.ticket.ProxyTicketProvider;
@@ -45,11 +45,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.kakawait.spring.boot.security.cas.CasSecurityAutoConfiguration.CasLoginSecurityConfiguration;
-import static com.kakawait.spring.boot.security.cas.CasSecurityAutoConfiguration.DefaultCasSecurityConfigurerAdapter;
-import static com.kakawait.spring.boot.security.cas.CasSecurityAutoConfiguration.DynamicCasSecurityConfiguration;
-import static com.kakawait.spring.boot.security.cas.CasSecurityAutoConfiguration.StaticCasSecurityConfiguration;
-import static com.kakawait.spring.boot.security.cas.CasSecurityProperties.CAS_AUTH_ORDER;
+import static com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration.CasLoginSecurityConfiguration;
+import static com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration.DefaultCasSecurityConfigurerAdapter;
+import static com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration.DynamicCasSecurityConfiguration;
+import static com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration.StaticCasSecurityConfiguration;
+import static com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityProperties.CAS_AUTH_ORDER;
 
 /**
  * @author Thibaud Leprêtre

diff --git a/...ot/security/cas/CasSecurityCondition.java → ...s/autoconfigure/CasSecurityCondition.java b/...ot/security/cas/CasSecurityCondition.java → ...s/autoconfigure/CasSecurityCondition.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...t/security/cas/CasSecurityConfigurer.java → .../autoconfigure/CasSecurityConfigurer.java b/...t/security/cas/CasSecurityConfigurer.java → .../autoconfigure/CasSecurityConfigurer.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import org.springframework.security.config.annotation.SecurityBuilder;
 import org.springframework.security.config.annotation.SecurityConfigurer;

diff --git a/...ity/cas/CasSecurityConfigurerAdapter.java → ...nfigure/CasSecurityConfigurerAdapter.java b/...ity/cas/CasSecurityConfigurerAdapter.java → ...nfigure/CasSecurityConfigurerAdapter.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 

diff --git a/...t/security/cas/CasSecurityProperties.java → .../autoconfigure/CasSecurityProperties.java b/...t/security/cas/CasSecurityProperties.java → .../autoconfigure/CasSecurityProperties.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import lombok.Data;
 import lombok.Getter;

diff --git a/...cas/CasSingleSignOutFilterConfigurer.java → ...ure/CasSingleSignOutFilterConfigurer.java b/...cas/CasSingleSignOutFilterConfigurer.java → ...ure/CasSingleSignOutFilterConfigurer.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import lombok.NonNull;
 import lombok.Setter;

diff --git a/...curity/cas/CasTicketValidatorBuilder.java → ...oconfigure/CasTicketValidatorBuilder.java b/...curity/cas/CasTicketValidatorBuilder.java → ...oconfigure/CasTicketValidatorBuilder.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import lombok.Setter;
 import lombok.experimental.Accessors;

diff --git a/.../cas/CasTicketValidatorConfiguration.java → ...gure/CasTicketValidatorConfiguration.java b/.../cas/CasTicketValidatorConfiguration.java → ...gure/CasTicketValidatorConfiguration.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import org.jasig.cas.client.validation.TicketValidator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

diff --git a/...oot1CasHttpSecurityConfigurerAdapter.java → ...oot1CasHttpSecurityConfigurerAdapter.java b/...oot1CasHttpSecurityConfigurerAdapter.java → ...oot1CasHttpSecurityConfigurerAdapter.java
@@ -1,4 +1,4 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.Order;
@@ -12,7 +12,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import static com.kakawait.spring.boot.security.cas.SpringBoot1CasHttpSecurityConfigurerAdapter.SpringBoot1SecurityProperties.SECURITY_PROPERTIES_HEADERS_CLASS;
+import static com.kakawait.spring.boot.security.cas.autoconfigure.SpringBoot1CasHttpSecurityConfigurerAdapter.SpringBoot1SecurityProperties.SECURITY_PROPERTIES_HEADERS_CLASS;
 
 /**
  * @author Thibaud Leprêtre

diff --git a/cas-security-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/cas-security-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.kakawait.spring.boot.security.cas.CasSecurityAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration
diff --git a/...asAuthenticationFilterConfigurerTest.java → ...asAuthenticationFilterConfigurerTest.java b/...asAuthenticationFilterConfigurerTest.java → ...asAuthenticationFilterConfigurerTest.java
@@ -1,6 +1,7 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasAuthenticationFilterConfigurer;
 import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage;
 import org.junit.Test;
 import org.mockito.Mockito;

diff --git a/...nticationProviderSecurityBuilderTest.java → ...nticationProviderSecurityBuilderTest.java b/...nticationProviderSecurityBuilderTest.java → ...nticationProviderSecurityBuilderTest.java
@@ -1,5 +1,7 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasAuthenticationProviderSecurityBuilder;
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityProperties;
 import com.kakawait.spring.security.cas.authentication.DynamicProxyCallbackUrlCasAuthenticationProvider;
 import org.jasig.cas.client.validation.TicketValidator;
 import org.junit.Before;

diff --git a/...cas/CasSecurityAutoConfigurationTest.java → ...ure/CasSecurityAutoConfigurationTest.java b/...cas/CasSecurityAutoConfigurationTest.java → ...ure/CasSecurityAutoConfigurationTest.java
@@ -1,6 +1,7 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
 
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration;
 import com.kakawait.spring.security.cas.LaxServiceProperties;
 import com.kakawait.spring.security.cas.client.ticket.AttributePrincipalProxyTicketProvider;
 import com.kakawait.spring.security.cas.client.ticket.ProxyTicketProvider;
@@ -16,7 +17,6 @@
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -173,7 +173,7 @@ public void autoConfigure_WithProxyCallbackPathButWithoutCallbackUrl_RelativePro
     public void autoConfigure_EmptyConfiguration_DefaultCasSecurityConfigurerAdapterBean() {
         load(EmptyConfiguration.class);
 
-        String beanName ="com.kakawait.spring.boot.security.cas.CasSecurityAutoConfiguration$" +
+        String beanName ="com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityAutoConfiguration$" +
                 "DefaultCasSecurityConfigurerAdapter";
         context.getBean(beanName);
     }

diff --git a/...CasSingleSignOutFilterConfigurerTest.java → ...CasSingleSignOutFilterConfigurerTest.java b/...CasSingleSignOutFilterConfigurerTest.java → ...CasSingleSignOutFilterConfigurerTest.java
@@ -1,5 +1,6 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasSingleSignOutFilterConfigurer;
 import org.jasig.cas.client.session.SessionMappingStorage;
 import org.jasig.cas.client.session.SingleSignOutFilter;
 import org.junit.Test;

diff --git a/...ty/cas/CasTicketValidatorBuilderTest.java → ...figure/CasTicketValidatorBuilderTest.java b/...ty/cas/CasTicketValidatorBuilderTest.java → ...figure/CasTicketValidatorBuilderTest.java
@@ -1,5 +1,6 @@
-package com.kakawait.spring.boot.security.cas;
+package com.kakawait.spring.boot.security.cas.autoconfigure;
 
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasTicketValidatorBuilder;
 import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage;
 import org.jasig.cas.client.proxy.ProxyRetriever;
 import org.jasig.cas.client.ssl.HttpURLConnectionFactory;
@@ -36,11 +37,11 @@ public class CasTicketValidatorBuilderTest {
     private static final String CAS_SERVER_URL_PREFIX = "http://my.cas.server.base.url/";
 
     private static final String V1_WARN_MESSAGE_TEMPLATE =
-            "WARN com.kakawait.spring.boot.security.cas.CasTicketValidatorBuilder - " +
+            "WARN com.kakawait.spring.boot.security.cas.autoconfigure.CasTicketValidatorBuilder - " +
                     "Configuration \"%s\" isn't possible using protocol version 1, will be omitted!";
 
     private static final String SERVICE_VALIDATOR_WARN_MESSAGE_TEMPLATE =
-            "WARN com.kakawait.spring.boot.security.cas.CasTicketValidatorBuilder - " +
+            "WARN com.kakawait.spring.boot.security.cas.autoconfigure.CasTicketValidatorBuilder - " +
                     "Configuration \"%s\" isn't possible using service ticket validator " +
                     "(please consider proxy ticket validator), will be omitted!";
 

diff --git a/...boot-sample/src/main/java/com/kakawait/sample/CasSecuritySpringBootSampleApplication.java b/...boot-sample/src/main/java/com/kakawait/sample/CasSecuritySpringBootSampleApplication.java
@@ -1,10 +1,8 @@
 package com.kakawait.sample;
 
-import com.kakawait.spring.boot.security.cas.CasHttpSecurityConfigurer;
-import com.kakawait.spring.boot.security.cas.CasSecurityCondition;
-import com.kakawait.spring.boot.security.cas.CasSecurityConfigurer;
-import com.kakawait.spring.boot.security.cas.CasSecurityConfigurerAdapter;
-import com.kakawait.spring.boot.security.cas.CasSecurityProperties;
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasHttpSecurityConfigurer;
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityCondition;
+import com.kakawait.spring.boot.security.cas.autoconfigure.CasSecurityConfigurerAdapter;
 import com.kakawait.spring.security.cas.client.CasAuthorizationInterceptor;
 import com.kakawait.spring.security.cas.client.ticket.ProxyTicketProvider;
 import com.kakawait.spring.security.cas.client.validation.AssertionProvider;
@@ -13,13 +11,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -49,7 +45,6 @@
 import org.springframework.web.filter.ForwardedHeaderFilter;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import java.lang.reflect.Field;
 import java.security.Principal;