MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing `@Valid` annotations

This commit is contained in:
ravi-signal 2024-09-13 09:54:32 -05:00 committed by GitHub
parent 8bafb1a641
commit b666b66160
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/configuration/Cdn3StorageManagerConfiguration.java
View File

@ -2,6 +2,7 @@ package org.whispersystems.textsecuregcm.configuration;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.whispersystems.textsecuregcm.configuration.secrets.SecretString; import org.whispersystems.textsecuregcm.configuration.secrets.SecretString;
@ -24,8 +25,8 @@ public record Cdn3StorageManagerConfiguration(
@NotNull SecretString clientSecret, @NotNull SecretString clientSecret,
@NotNull Map<Integer, String> sourceSchemes, @NotNull Map<Integer, String> sourceSchemes,
@NotNull Integer numHttpClients, @NotNull Integer numHttpClients,
@NotNull CircuitBreakerConfiguration circuitBreaker, @NotNull @Valid CircuitBreakerConfiguration circuitBreaker,
@NotNull RetryConfiguration retry) { @NotNull @Valid RetryConfiguration retry) {
public Cdn3StorageManagerConfiguration { public Cdn3StorageManagerConfiguration {
if (numHttpClients == null) { if (numHttpClients == null) {

3
service/src/main/java/org/whispersystems/textsecuregcm/configuration/ClientCdnConfiguration.java
View File

@ -1,6 +1,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -15,10 +16,12 @@ public class ClientCdnConfiguration {
@JsonProperty @JsonProperty
@NotNull @NotNull
@Valid
CircuitBreakerConfiguration circuitBreaker = new CircuitBreakerConfiguration(); CircuitBreakerConfiguration circuitBreaker = new CircuitBreakerConfiguration();
@JsonProperty @JsonProperty
@NotNull @NotNull
@Valid
RetryConfiguration retry = new RetryConfiguration(); RetryConfiguration retry = new RetryConfiguration();
public CircuitBreakerConfiguration getCircuitBreaker() { public CircuitBreakerConfiguration getCircuitBreaker() {

3
service/src/main/java/org/whispersystems/textsecuregcm/configuration/HCaptchaConfiguration.java
View File

@ -6,6 +6,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonTypeName;
import org.whispersystems.textsecuregcm.captcha.HCaptchaClient; import org.whispersystems.textsecuregcm.captcha.HCaptchaClient;
@ -24,10 +25,12 @@ public class HCaptchaConfiguration implements HCaptchaClientFactory {
@JsonProperty @JsonProperty
@NotNull @NotNull
@Valid
CircuitBreakerConfiguration circuitBreaker = new CircuitBreakerConfiguration(); CircuitBreakerConfiguration circuitBreaker = new CircuitBreakerConfiguration();
@JsonProperty @JsonProperty
@NotNull @NotNull
@Valid
RetryConfiguration retry = new RetryConfiguration(); RetryConfiguration retry = new RetryConfiguration();