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

Replace all org.hibernate validators with modern javax.validation

This commit is contained in:
Ehren Kret 2021-02-06 21:01:56 -06:00
parent d09b36b1d5
commit 6865cdfce3
31 changed files with 55 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/ApnConfiguration.java
View File

@ -5,7 +5,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class ApnConfiguration { public class ApnConfiguration {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/AwsAttachmentsConfiguration.java
View File

@ -5,7 +5,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class AwsAttachmentsConfiguration { public class AwsAttachmentsConfiguration {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/CdnConfiguration.java
View File

@ -6,7 +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 org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class CdnConfiguration { public class CdnConfiguration {
@NotEmpty @NotEmpty

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryClientConfiguration.java
View File

@ -5,9 +5,9 @@
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.constraints.NotEmpty;
import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.binary.Hex;
import org.hibernate.validator.constraints.NotEmpty;
public class DirectoryClientConfiguration { public class DirectoryClientConfiguration {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryServerConfiguration.java
View File

@ -5,7 +5,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class DirectoryServerConfiguration { public class DirectoryServerConfiguration {

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

@ -5,8 +5,7 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
public class GcmConfiguration { public class GcmConfiguration {

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

@ -8,9 +8,8 @@ package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.dropwizard.util.Strings; import io.dropwizard.util.Strings;
import io.dropwizard.validation.ValidationMethod; import io.dropwizard.validation.ValidationMethod;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
public class GcpAttachmentsConfiguration { public class GcpAttachmentsConfiguration {

4
service/src/main/java/org/whispersystems/textsecuregcm/configuration/MaxDeviceConfiguration.java
View File

@ -6,9 +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.constraints.NotEmpty;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
public class MaxDeviceConfiguration { public class MaxDeviceConfiguration {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java
View File

@ -6,8 +6,6 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
public class PushConfiguration { public class PushConfiguration {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/RecaptchaConfiguration.java
View File

@ -6,7 +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 org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class RecaptchaConfiguration { public class RecaptchaConfiguration {

8
service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisConfiguration.java
View File

@ -6,13 +6,11 @@ package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty;
import org.hibernate.validator.constraints.URL;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.time.Duration; import java.time.Duration;
import java.util.List; import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
public class RedisConfiguration { public class RedisConfiguration {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureBackupServiceConfiguration.java
View File

@ -6,9 +6,9 @@
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.constraints.NotEmpty;
import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.binary.Hex;
import org.hibernate.validator.constraints.NotEmpty;
public class SecureBackupServiceConfiguration { public class SecureBackupServiceConfiguration {

7
service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureStorageServiceConfiguration.java
View File

@ -7,13 +7,12 @@ package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
public class SecureStorageServiceConfiguration { public class SecureStorageServiceConfiguration {

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

@ -5,9 +5,8 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty;
import java.util.List; import java.util.List;
import javax.validation.constraints.NotEmpty;
public class SqsConfiguration { public class SqsConfiguration {
@NotEmpty @NotEmpty

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

@ -6,8 +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 org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
public class TestDeviceConfiguration { public class TestDeviceConfiguration {

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

@ -6,10 +6,9 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
public class TurnConfiguration { public class TurnConfiguration {

8
service/src/main/java/org/whispersystems/textsecuregcm/configuration/VoiceVerificationConfiguration.java
View File

@ -6,14 +6,12 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
public class VoiceVerificationConfiguration { public class VoiceVerificationConfiguration {

4
service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountAttributes.java
View File

@ -7,7 +7,7 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import java.util.List; import java.util.List;
import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Size;
import org.whispersystems.textsecuregcm.storage.Device.DeviceCapabilities; import org.whispersystems.textsecuregcm.storage.Device.DeviceCapabilities;
import org.whispersystems.textsecuregcm.storage.PaymentAddress; import org.whispersystems.textsecuregcm.storage.PaymentAddress;
@ -20,7 +20,7 @@ public class AccountAttributes {
private int registrationId; private int registrationId;
@JsonProperty @JsonProperty
@Length(max = 204, message = "This field must be less than 50 characters") @Size(max = 204, message = "This field must be less than 50 characters")
private String name; private String name;
@JsonProperty @JsonProperty

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java
View File

@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class ApnRegistrationId { public class ApnRegistrationId {

5
service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java
View File

@ -8,13 +8,12 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
import org.signal.zkgroup.profiles.ProfileKeyCommitment; import org.signal.zkgroup.profiles.ProfileKeyCommitment;
import org.whispersystems.textsecuregcm.util.ExactlySize; import org.whispersystems.textsecuregcm.util.ExactlySize;
import javax.validation.constraints.NotNull;
public class CreateProfileRequest { public class CreateProfileRequest {
@JsonProperty @JsonProperty

6
service/src/main/java/org/whispersystems/textsecuregcm/entities/DeprecatedPin.java
View File

@ -7,14 +7,14 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Size;
public class DeprecatedPin { public class DeprecatedPin {
@JsonProperty @JsonProperty
@NotEmpty @NotEmpty
@Length(min=4,max=20) @Size(min=4, max=20)
private String pin; private String pin;
public DeprecatedPin() {} public DeprecatedPin() {}

6
service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceName.java
View File

@ -6,14 +6,14 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Size;
public class DeviceName { public class DeviceName {
@JsonProperty @JsonProperty
@NotEmpty @NotEmpty
@Length(max = 300, message = "This field must be less than 300 characters") @Size(max = 300, message = "This field must be less than 300 characters")
private String deviceName; private String deviceName;
public DeviceName() {} public DeviceName() {}

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationResponse.java
View File

@ -6,7 +6,7 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class DirectoryReconciliationResponse { public class DirectoryReconciliationResponse {

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java
View File

@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class GcmRegistrationId { public class GcmRegistrationId {

3
service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKey.java
View File

@ -6,8 +6,7 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
public class PreKey { public class PreKey {

8
service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKeyState.java
View File

@ -6,12 +6,10 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
public class PreKeyState { public class PreKeyState {

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/ProvisioningMessage.java
View File

@ -6,7 +6,7 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class ProvisioningMessage { public class ProvisioningMessage {

6
service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLock.java
View File

@ -7,13 +7,13 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Size;
public class RegistrationLock { public class RegistrationLock {
@JsonProperty @JsonProperty
@Length(min=64,max=64) @Size(min=64, max=64)
@NotEmpty @NotEmpty
private String registrationLock; private String registrationLock;

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/SignedPreKey.java
View File

@ -6,7 +6,7 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
public class SignedPreKey extends PreKey { public class SignedPreKey extends PreKey {

3
service/src/main/java/org/whispersystems/textsecuregcm/entities/UnregisteredEvent.java
View File

@ -6,9 +6,8 @@
package org.whispersystems.textsecuregcm.entities; package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
public class UnregisteredEvent { public class UnregisteredEvent {

20
service/src/main/java/org/whispersystems/textsecuregcm/metrics/LoggingNetworkAppenderFactory.java
View File

@ -6,28 +6,26 @@
package org.whispersystems.textsecuregcm.metrics; package org.whispersystems.textsecuregcm.metrics;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.hibernate.validator.constraints.NotEmpty;
import org.productivity.java.syslog4j.SyslogConfigIF;
import org.productivity.java.syslog4j.SyslogIF;
import org.productivity.java.syslog4j.SyslogRuntimeException;
import org.productivity.java.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogConfig;
import javax.validation.constraints.NotNull;
import java.util.TimeZone;
import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.classic.util.LevelToSyslogSeverity; import ch.qos.logback.classic.util.LevelToSyslogSeverity;
import ch.qos.logback.core.Appender; import ch.qos.logback.core.Appender;
import ch.qos.logback.core.AppenderBase; import ch.qos.logback.core.AppenderBase;
import ch.qos.logback.core.Layout; import ch.qos.logback.core.Layout;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.dropwizard.logging.AbstractAppenderFactory; import io.dropwizard.logging.AbstractAppenderFactory;
import io.dropwizard.logging.async.AsyncAppenderFactory; import io.dropwizard.logging.async.AsyncAppenderFactory;
import io.dropwizard.logging.filter.LevelFilterFactory; import io.dropwizard.logging.filter.LevelFilterFactory;
import io.dropwizard.logging.layout.LayoutFactory; import io.dropwizard.logging.layout.LayoutFactory;
import io.dropwizard.validation.PortRange; import io.dropwizard.validation.PortRange;
import java.util.TimeZone;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import org.productivity.java.syslog4j.SyslogConfigIF;
import org.productivity.java.syslog4j.SyslogIF;
import org.productivity.java.syslog4j.SyslogRuntimeException;
import org.productivity.java.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogConfig;
@JsonTypeName("papertrail") @JsonTypeName("papertrail")
public class LoggingNetworkAppenderFactory extends AbstractAppenderFactory<ILoggingEvent> { public class LoggingNetworkAppenderFactory extends AbstractAppenderFactory<ILoggingEvent> {