Skip to content

Commit 76827bc

Browse files
author
Rujun Chen
authored
Finish todo after spring boot version upgrade to 2.4.0 (Azure#20188)
1 parent 50d9ce4 commit 76827bc

13 files changed

+3
-399
lines changed

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/AADWebSecurityConfigurerAdapter.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
2020
import org.springframework.util.StringUtils;
2121

22-
import java.net.URI;
23-
2422
/**
2523
* Abstract configuration class, used to make AzureClientRegistrationRepository and AuthzCodeGrantRequestEntityConverter
2624
* take effect.
@@ -60,8 +58,7 @@ protected LogoutSuccessHandler oidcLogoutSuccessHandler() {
6058
new OidcClientInitiatedLogoutSuccessHandler(this.repo);
6159
String uri = this.properties.getPostLogoutRedirectUri();
6260
if (StringUtils.hasText(uri)) {
63-
// TODO (jack) Remove deprecated method after we do not need to support spring-boot-2.2.x
64-
oidcLogoutSuccessHandler.setPostLogoutRedirectUri(URI.create(uri));
61+
oidcLogoutSuccessHandler.setPostLogoutRedirectUri(uri);
6562
}
6663
return oidcLogoutSuccessHandler;
6764
}

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/JacksonHttpSessionOAuth2AuthorizedClientRepository.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
package com.azure.spring.aad.webapp;
55

6-
import com.azure.spring.aad.webapp.jackson.AADDatabindModule;
76
import com.fasterxml.jackson.core.JsonProcessingException;
87
import com.fasterxml.jackson.core.type.TypeReference;
98
import com.fasterxml.jackson.databind.ObjectMapper;
109
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1110
import org.springframework.security.core.Authentication;
1211
import org.springframework.security.jackson2.CoreJackson2Module;
1312
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
13+
import org.springframework.security.oauth2.client.jackson2.OAuth2ClientJackson2Module;
1414
import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
1515
import org.springframework.util.Assert;
1616

@@ -39,9 +39,7 @@ public class JacksonHttpSessionOAuth2AuthorizedClientRepository implements OAuth
3939

4040
public JacksonHttpSessionOAuth2AuthorizedClientRepository() {
4141
objectMapper = new ObjectMapper();
42-
// TODO: Use OAuth2ClientJackson2Module in spring-security
43-
// after min spring-security version we need to support >=5.3.0
44-
objectMapper.registerModule(new AADDatabindModule());
42+
objectMapper.registerModule(new OAuth2ClientJackson2Module());
4543
objectMapper.registerModule(new CoreJackson2Module());
4644
objectMapper.registerModule(new JavaTimeModule());
4745
}

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADClientRegistrationDeserializer.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADClientRegistrationMixin.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADDatabindModule.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADJsonNodeUtil.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADOAuth2AccessTokenMixin.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADOAuth2AuthorizedClientMixin.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADOAuth2RefreshTokenMixin.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADStdConverters.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)