Skip to content

Commit 11c151f

Browse files
authored
Declare clientSettings and tokenSettings as Object type to avoid compilation error with jdk8 or jdk11 (#15486)
1 parent 8031aaa commit 11c151f

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

dubbo-plugin/dubbo-spring-security/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
<artifactId>spring-security-core</artifactId>
6060
</dependency>
6161

62+
<dependency>
63+
<groupId>org.springframework.security</groupId>
64+
<artifactId>spring-security-oauth2-core</artifactId>
65+
<optional>true</optional>
66+
</dependency>
67+
6268
<dependency>
6369
<groupId>org.springframework.security</groupId>
6470
<artifactId>spring-security-oauth2-client</artifactId>
@@ -70,6 +76,7 @@
7076
<groupId>org.springframework.security</groupId>
7177
<artifactId>spring-security-oauth2-authorization-server</artifactId>
7278
<version>${spring.oauth2.server}</version>
79+
<scope>test</scope>
7380
<optional>true</optional>
7481
</dependency>
7582
<!-- spring security -->

dubbo-plugin/dubbo-spring-security/src/main/java/org/apache/dubbo/spring/security/oauth2/RegisteredClientMixin.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import com.fasterxml.jackson.annotation.JsonTypeInfo;
2727
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2828
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
29-
import org.springframework.security.oauth2.server.authorization.settings.ClientSettings;
30-
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
3129

3230
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
3331
@JsonAutoDetect(
@@ -38,6 +36,11 @@
3836
@JsonIgnoreProperties(ignoreUnknown = true)
3937
abstract class RegisteredClientMixin {
4038

39+
/**
40+
* declare clientSettings and tokenSettings as Object type to avoid COMPILATION ERROR when compile it with jdk8
41+
* or jdk11, both ClientSettings and TokenSettings class file version are 61.0 which is higher than the version
42+
* which jdk8 (class file version: 52.0) or jdk11 (class file version: 55.0) could support.
43+
*/
4144
@JsonCreator
4245
public RegisteredClientMixin(
4346
@JsonProperty("id") String id,
@@ -51,6 +54,6 @@ public RegisteredClientMixin(
5154
@JsonProperty("redirectUris") Set<String> redirectUris,
5255
@JsonProperty("postLogoutRedirectUris") Set<String> postLogoutRedirectUris,
5356
@JsonProperty("scopes") Set<String> scopes,
54-
@JsonProperty("clientSettings") ClientSettings clientSettings,
55-
@JsonProperty("tokenSettings") TokenSettings tokenSettings) {}
57+
@JsonProperty("clientSettings") Object clientSettings,
58+
@JsonProperty("tokenSettings") Object tokenSettings) {}
5659
}

0 commit comments

Comments
 (0)