Skip to content

Commit 23047ca

Browse files
committed
fix(review): address PR #264 review feedback
- Rename DevLoginAutoConfiguration → DevLoginConfiguration and WebAuthnAutoConfiguration → WebAuthnConfiguration to avoid implying Spring Boot SPI semantics (these are component-scanned, not SPI-registered via AutoConfiguration.imports) - Remove @propertysource from DevLoginConfiguration: the annotation cannot influence its own @ConditionalOnProperty evaluation (condition is checked before @propertysource is processed), and defaults are already available via WebAuthnConfiguration which unconditionally loads dsspringuserconfig.properties
1 parent 258fb75 commit 23047ca

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/main/java/com/digitalsanctuary/spring/user/dev/DevLoginAutoConfiguration.java renamed to src/main/java/com/digitalsanctuary/spring/user/dev/DevLoginConfiguration.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
import org.springframework.boot.context.properties.EnableConfigurationProperties;
55
import org.springframework.context.annotation.Configuration;
66
import org.springframework.context.annotation.Profile;
7-
import org.springframework.context.annotation.PropertySource;
87

98
/**
10-
* Auto-configuration for the dev login feature.
9+
* Configuration that registers {@link DevLoginConfigProperties}.
1110
* <p>
1211
* Activates only when the {@code local} profile is active and
1312
* {@code user.dev.auto-login-enabled=true}. Individual dev-login components
1413
* ({@link DevLoginController}, {@link DevLoginStartupWarning}) carry their own
1514
* guards for defense-in-depth.
1615
* </p>
16+
* <p>
17+
* Note: this class is registered via component scan (not Spring Boot SPI), so
18+
* default property values are provided by {@code WebAuthnConfiguration}, which
19+
* unconditionally loads {@code classpath:config/dsspringuserconfig.properties}.
20+
* </p>
1721
*/
1822
@Configuration
1923
@Profile("local")
2024
@ConditionalOnProperty(name = "user.dev.auto-login-enabled", havingValue = "true", matchIfMissing = false)
21-
@PropertySource("classpath:config/dsspringuserconfig.properties")
2225
@EnableConfigurationProperties(DevLoginConfigProperties.class)
23-
public class DevLoginAutoConfiguration {
26+
public class DevLoginConfiguration {
2427
}

src/main/java/com/digitalsanctuary/spring/user/security/WebAuthnAutoConfiguration.java renamed to src/main/java/com/digitalsanctuary/spring/user/security/WebAuthnConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.context.annotation.PropertySource;
66

77
/**
8-
* Auto-configuration that registers {@link WebAuthnConfigProperties}.
8+
* Configuration that registers {@link WebAuthnConfigProperties}.
99
* <p>
1010
* This configuration is always active because {@code WebSecurityConfig} requires
1111
* {@link WebAuthnConfigProperties} regardless of whether WebAuthn is enabled.
@@ -16,5 +16,5 @@
1616
@Configuration
1717
@PropertySource("classpath:config/dsspringuserconfig.properties")
1818
@EnableConfigurationProperties(WebAuthnConfigProperties.class)
19-
public class WebAuthnAutoConfiguration {
19+
public class WebAuthnConfiguration {
2020
}

0 commit comments

Comments
 (0)