Skip to content

Commit e36e2b2

Browse files
marcusdacoregiomarcusdacoregio
committed
Move Saml2AuthnRequestRepository to web package
Moving to solve package tangles Issue spring-projectsgh-9185
1 parent cff0bde commit e36e2b2

File tree

21 files changed

+64
-80
lines changed

21 files changed

+64
-80
lines changed

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationRequestFactory;
4242
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
4343
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
44-
import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
45-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
4644
import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter;
4745
import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationRequestFilter;
4846
import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
4947
import org.springframework.security.saml2.provider.service.web.DefaultSaml2AuthenticationRequestContextResolver;
48+
import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
5049
import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
5150
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
51+
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
5252
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
5353
import org.springframework.security.web.authentication.AuthenticationConverter;
5454
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@
7878
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
7979
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
8080
import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
81-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
8281
import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter;
8382
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
83+
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
8484
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
8585
import org.springframework.security.web.FilterChainProxy;
8686
import org.springframework.security.web.SecurityFilterChain;

‎etc/s101/repository/repository.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
</xs-configuration>
1010
<!--Note: All date strings are stored in short US format e.g. 2/1/06 for 1st Feb 2006-->
1111
<project name="snapshots" dir="snapshots" baselineSnapshot="default" version="19139">
12-
<snapshot label="baseline" location="baseline" timestamp="3/16/21, 4:42 PM" version="19139" detail="true" good="true" size="20" />
12+
<snapshot label="baseline" location="baseline" timestamp="9/29/21, 2:04 PM" version="19147" detail="true" good="true" size="1530" />
1313
</project>
1414
</structure101-repository>

‎etc/s101/repository/snapshots/baseline/arch.hsx

0 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/key-measures.xml

Lines changed: 51 additions & 65 deletions
Large diffs are not rendered by default.

‎etc/s101/repository/snapshots/baseline/package-slice.hsx

-31 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/settings.hsx

-24 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/spec.hsx

0 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/summary.hsx

-30 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/xb.hsx

208 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/xblite.hsx

-19 Bytes
Binary file not shown.

‎etc/s101/repository/snapshots/baseline/xs-offenders.hsx

-55 Bytes
Binary file not shown.

‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest;
2929
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
3030
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
31-
import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
32-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
3331
import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
32+
import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
3433
import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
34+
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
3535
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
3636
import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
3737
import org.springframework.security.web.authentication.AuthenticationConverter;

‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
3737
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
3838
import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
39-
import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
40-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
4139
import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
4240
import org.springframework.security.saml2.provider.service.web.DefaultSaml2AuthenticationRequestContextResolver;
41+
import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
4342
import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
4443
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
44+
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
4545
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
4646
import org.springframework.security.web.util.matcher.RequestMatcher;
4747
import org.springframework.security.web.util.matcher.RequestMatcher.MatchResult;

‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepository.java renamed to ‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/HttpSessionSaml2AuthenticationRequestRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.saml2.provider.service.servlet;
17+
package org.springframework.security.saml2.provider.service.web;
1818

1919
import javax.servlet.http.HttpServletRequest;
2020
import javax.servlet.http.HttpServletResponse;

‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/Saml2AuthenticationRequestRepository.java renamed to ‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationRequestRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.saml2.provider.service.servlet;
17+
package org.springframework.security.saml2.provider.service.web;
1818

1919
import javax.servlet.http.HttpServletRequest;
2020
import javax.servlet.http.HttpServletResponse;

‎saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
3737
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
3838
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
39-
import org.springframework.security.saml2.provider.service.servlet.HttpSessionSaml2AuthenticationRequestRepository;
40-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
4139
import org.springframework.security.web.authentication.AuthenticationConverter;
4240
import org.springframework.util.Assert;
4341

‎saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/HttpSessionSaml2AuthenticationRequestRepositoryTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.mock.web.MockHttpServletResponse;
2424
import org.springframework.mock.web.MockHttpSession;
2525
import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest;
26+
import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
2627

2728
import static org.assertj.core.api.Assertions.assertThat;
2829
import static org.mockito.ArgumentMatchers.anyString;

‎saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
3838
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
3939
import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
40-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
4140
import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
4241
import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
42+
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
4343
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationTokenConverter;
4444
import org.springframework.security.web.authentication.AuthenticationConverter;
4545
import org.springframework.security.web.authentication.WebAuthenticationDetails;

‎saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
3939
import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
4040
import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
41-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
4241
import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
4342
import org.springframework.security.saml2.provider.service.web.DefaultSaml2AuthenticationRequestContextResolver;
4443
import org.springframework.security.saml2.provider.service.web.RelyingPartyRegistrationResolver;
4544
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestContextResolver;
45+
import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
4646
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
4747
import org.springframework.security.web.util.matcher.RequestMatcher;
4848
import org.springframework.web.util.HtmlUtils;

‎saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
3838
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
3939
import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
40-
import org.springframework.security.saml2.provider.service.servlet.Saml2AuthenticationRequestRepository;
4140
import org.springframework.util.StreamUtils;
4241
import org.springframework.web.util.UriUtils;
4342

0 commit comments

Comments
 (0)