Skip to content

Commit a0beda1

Browse files
committed
fix NullPointerException for empty map in CaptchaProperties
1 parent f7897c1 commit a0beda1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

captchaservice-backend/src/main/java/de/muenchen/captchaservice/configuration/captcha/CaptchaProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public record CaptchaProperties(@NotBlank String hmacKey, long ttlSeconds, Map<S
1212
public CaptchaProperties(final String hmacKey, final long ttlSeconds, final Map<String, CaptchaSite> sites, final long sourceAddressWindowSeconds) {
1313
this.hmacKey = hmacKey;
1414
this.ttlSeconds = ttlSeconds;
15-
this.sites = Map.copyOf(sites);
15+
this.sites = sites != null ? Map.copyOf(sites) : Map.of();
1616
this.sourceAddressWindowSeconds = sourceAddressWindowSeconds;
1717
}
1818
}

captchaservice-backend/src/main/java/de/muenchen/captchaservice/configuration/captcha/CaptchaSite.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package de.muenchen.captchaservice.configuration.captcha;
22

3+
import jakarta.validation.constraints.NotNull;
4+
35
import java.util.List;
46

5-
public record CaptchaSite(String siteKey, String secret, List<DifficultyItem> difficultyMap) {
7+
public record CaptchaSite(String siteKey, String secret, @NotNull List<DifficultyItem> difficultyMap) {
68
public CaptchaSite(final String siteKey, final String secret, final List<DifficultyItem> difficultyMap) {
79
this.siteKey = siteKey;
810
this.secret = secret;

captchaservice-backend/src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ info:
5555

5656
captcha:
5757
hmac-key: null
58-
sites: []
58+
sites: {}
5959
ttl-seconds: 1200

0 commit comments

Comments
 (0)