Introduce configuration properties prefix constants for OAuth2ResourceServerProperties

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/IssuerUriCondition.java

@@ -36,11 +36,11 @@ class IssuerUriCondition extends SpringBootCondition {
 	public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
 		ConditionMessage.Builder message = ConditionMessage.forCondition("OpenID Connect Issuer URI Condition");
 		Environment environment = context.getEnvironment();
-		String issuerUri = environment.getProperty("spring.security.oauth2.resourceserver.jwt.issuer-uri");
+		String issuerUri = environment.getProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".issuer-uri");
 		if (!StringUtils.hasText(issuerUri)) {
 			return ConditionOutcome.noMatch(message.didNotFind("issuer-uri property").atAll());
 		}
-		String jwkSetUri = environment.getProperty("spring.security.oauth2.resourceserver.jwt.jwk-set-uri");
+		String jwkSetUri = environment.getProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".jwk-set-uri");
 		if (StringUtils.hasText(jwkSetUri)) {
 			return ConditionOutcome.noMatch(message.found("jwk-set-uri property").items(jwkSetUri));
 		}

module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/KeyValueCondition.java

@@ -36,15 +36,15 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
 		ConditionMessage.Builder message = ConditionMessage.forCondition("Public Key Value Condition");
 		Environment environment = context.getEnvironment();
 		String publicKeyLocation = environment
-			.getProperty("spring.security.oauth2.resourceserver.jwt.public-key-location");
+			.getProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".public-key-location");
 		if (!StringUtils.hasText(publicKeyLocation)) {
 			return ConditionOutcome.noMatch(message.didNotFind("public-key-location property").atAll());
 		}
-		String jwkSetUri = environment.getProperty("spring.security.oauth2.resourceserver.jwt.jwk-set-uri");
+		String jwkSetUri = environment.getProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".jwk-set-uri");
 		if (StringUtils.hasText(jwkSetUri)) {
 			return ConditionOutcome.noMatch(message.found("jwk-set-uri property").items(jwkSetUri));
 		}
-		String issuerUri = environment.getProperty("spring.security.oauth2.resourceserver.jwt.issuer-uri");
+		String issuerUri = environment.getProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".issuer-uri");
 		if (StringUtils.hasText(issuerUri)) {
 			return ConditionOutcome.noMatch(message.found("issuer-uri property").items(issuerUri));
 		}

module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/OAuth2ResourceServerProperties.java

@@ -37,9 +37,13 @@
  * @author Yan Kardziyaka
  * @since 4.0.0
  */
-@ConfigurationProperties("spring.security.oauth2.resourceserver")
+@ConfigurationProperties(OAuth2ResourceServerProperties.PROPERTIES_PREFIX)
 public class OAuth2ResourceServerProperties {
 
+	public static final String PROPERTIES_PREFIX = "spring.security.oauth2.resourceserver";
+
+	public static final String JWT_PROPERTIES__PREFIX = PROPERTIES_PREFIX + ".jwt";
+
 	private final Jwt jwt = new Jwt();
 
 	public Jwt getJwt() {
@@ -173,7 +177,7 @@ public void setPrincipalClaimName(String principalClaimName) {
 		}
 
 		public String readPublicKey() throws IOException {
-			String key = "spring.security.oauth2.resourceserver.public-key-location";
+			String key = JWT_PROPERTIES__PREFIX + ".public-key-location";
 			if (this.publicKeyLocation == null) {
 				throw new InvalidConfigurationPropertyValueException(key, this.publicKeyLocation,
 						"No public key location specified");

module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java

@@ -227,17 +227,17 @@ private static class JwtConverterPropertiesCondition extends AnyNestedCondition
 			super(ConfigurationPhase.REGISTER_BEAN);
 		}
 
-		@ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.authority-prefix")
+		@ConditionalOnProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".authority-prefix")
 		static class OnAuthorityPrefix {
 
 		}
 
-		@ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.principal-claim-name")
+		@ConditionalOnProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".principal-claim-name")
 		static class OnPrincipalClaimName {
 
 		}
 
-		@ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.authorities-claim-name")
+		@ConditionalOnProperty(OAuth2ResourceServerProperties.JWT_PROPERTIES__PREFIX + ".authorities-claim-name")
 		static class OnAuthoritiesClaimName {
 
 		}