From 6865cdfce3bf870bb039d28bafda35ff7aa520c7 Mon Sep 17 00:00:00 2001 From: Ehren Kret Date: Sat, 6 Feb 2021 21:01:56 -0600 Subject: [PATCH] Replace all org.hibernate validators with modern javax.validation --- .../configuration/ApnConfiguration.java | 2 +- .../AwsAttachmentsConfiguration.java | 2 +- .../configuration/CdnConfiguration.java | 2 +- .../DirectoryClientConfiguration.java | 2 +- .../DirectoryServerConfiguration.java | 2 +- .../configuration/GcmConfiguration.java | 3 +-- .../GcpAttachmentsConfiguration.java | 3 +-- .../configuration/MaxDeviceConfiguration.java | 4 +--- .../configuration/PushConfiguration.java | 2 -- .../configuration/RecaptchaConfiguration.java | 2 +- .../configuration/RedisConfiguration.java | 8 +++----- .../SecureBackupServiceConfiguration.java | 2 +- .../SecureStorageServiceConfiguration.java | 7 +++---- .../configuration/SqsConfiguration.java | 3 +-- .../TestDeviceConfiguration.java | 3 +-- .../configuration/TurnConfiguration.java | 5 ++--- .../VoiceVerificationConfiguration.java | 8 +++----- .../entities/AccountAttributes.java | 4 ++-- .../entities/ApnRegistrationId.java | 2 +- .../entities/CreateProfileRequest.java | 5 ++--- .../textsecuregcm/entities/DeprecatedPin.java | 6 +++--- .../textsecuregcm/entities/DeviceName.java | 6 +++--- .../DirectoryReconciliationResponse.java | 2 +- .../entities/GcmRegistrationId.java | 2 +- .../textsecuregcm/entities/PreKey.java | 3 +-- .../textsecuregcm/entities/PreKeyState.java | 8 +++----- .../entities/ProvisioningMessage.java | 2 +- .../entities/RegistrationLock.java | 6 +++--- .../textsecuregcm/entities/SignedPreKey.java | 2 +- .../entities/UnregisteredEvent.java | 3 +-- .../LoggingNetworkAppenderFactory.java | 20 +++++++++---------- 31 files changed, 55 insertions(+), 76 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ApnConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ApnConfiguration.java index 0cf5e9c13..131ad053b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ApnConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/ApnConfiguration.java @@ -5,7 +5,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class ApnConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AwsAttachmentsConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AwsAttachmentsConfiguration.java index 706e95297..b1d98271e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AwsAttachmentsConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/AwsAttachmentsConfiguration.java @@ -5,7 +5,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class AwsAttachmentsConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CdnConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CdnConfiguration.java index dd4aaea3a..910d59fdd 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CdnConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CdnConfiguration.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class CdnConfiguration { @NotEmpty diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryClientConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryClientConfiguration.java index 417a41e8e..6550ff414 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryClientConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryClientConfiguration.java @@ -5,9 +5,9 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; +import javax.validation.constraints.NotEmpty; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; -import org.hibernate.validator.constraints.NotEmpty; public class DirectoryClientConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryServerConfiguration.java index 208475265..c3d3bb0c8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DirectoryServerConfiguration.java @@ -5,7 +5,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class DirectoryServerConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java index e225e32c0..cd6a0c62c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcmConfiguration.java @@ -5,8 +5,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; public class GcmConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcpAttachmentsConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcpAttachmentsConfiguration.java index ece9d01f5..6970cc96f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcpAttachmentsConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/GcpAttachmentsConfiguration.java @@ -8,9 +8,8 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.util.Strings; import io.dropwizard.validation.ValidationMethod; -import org.hibernate.validator.constraints.NotEmpty; - import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; public class GcpAttachmentsConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MaxDeviceConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MaxDeviceConfiguration.java index eaa0cdfa7..b9b26ece8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MaxDeviceConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MaxDeviceConfiguration.java @@ -6,9 +6,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; - -import org.hibernate.validator.constraints.NotEmpty; - +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; public class MaxDeviceConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java index 28678418b..1ffd83838 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java @@ -6,8 +6,6 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - import javax.validation.constraints.Min; public class PushConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RecaptchaConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RecaptchaConfiguration.java index efab5a4b3..ddcec818b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RecaptchaConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RecaptchaConfiguration.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class RecaptchaConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisConfiguration.java index 145c84699..affb597eb 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisConfiguration.java @@ -6,13 +6,11 @@ package org.whispersystems.textsecuregcm.configuration; 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.util.List; +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; public class RedisConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureBackupServiceConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureBackupServiceConfiguration.java index 4bcb54a8a..de81a4de6 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureBackupServiceConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureBackupServiceConfiguration.java @@ -6,9 +6,9 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; +import javax.validation.constraints.NotEmpty; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; -import org.hibernate.validator.constraints.NotEmpty; public class SecureBackupServiceConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureStorageServiceConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureStorageServiceConfiguration.java index 3171c00ea..dae13c3cb 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureStorageServiceConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureStorageServiceConfiguration.java @@ -7,13 +7,12 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; 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.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; public class SecureStorageServiceConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SqsConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SqsConfiguration.java index 47506a052..9db5343c8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SqsConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SqsConfiguration.java @@ -5,9 +5,8 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - import java.util.List; +import javax.validation.constraints.NotEmpty; public class SqsConfiguration { @NotEmpty diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TestDeviceConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TestDeviceConfiguration.java index f176e3318..82b2fbf35 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TestDeviceConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TestDeviceConfiguration.java @@ -6,8 +6,7 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; public class TestDeviceConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TurnConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TurnConfiguration.java index 518800376..0acc0f63b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TurnConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TurnConfiguration.java @@ -6,10 +6,9 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - -import javax.validation.constraints.NotNull; import java.util.List; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; public class TurnConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/VoiceVerificationConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/VoiceVerificationConfiguration.java index a6b61b466..d0118135b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/VoiceVerificationConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/VoiceVerificationConfiguration.java @@ -6,14 +6,12 @@ package org.whispersystems.textsecuregcm.configuration; 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.List; import java.util.Set; +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; public class VoiceVerificationConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountAttributes.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountAttributes.java index b9c8185d9..25bfd77bb 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountAttributes.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountAttributes.java @@ -7,7 +7,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; 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.PaymentAddress; @@ -20,7 +20,7 @@ public class AccountAttributes { private int registrationId; @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; @JsonProperty diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java index 6c5cc8765..c8d288a50 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class ApnRegistrationId { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java index 4491023cb..538c0b1fe 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java @@ -8,13 +8,12 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; 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.hibernate.validator.constraints.NotEmpty; import org.signal.zkgroup.profiles.ProfileKeyCommitment; import org.whispersystems.textsecuregcm.util.ExactlySize; -import javax.validation.constraints.NotNull; - public class CreateProfileRequest { @JsonProperty diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeprecatedPin.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeprecatedPin.java index 4eb8545ff..31371a31f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeprecatedPin.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeprecatedPin.java @@ -7,14 +7,14 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; public class DeprecatedPin { @JsonProperty @NotEmpty - @Length(min=4,max=20) + @Size(min=4, max=20) private String pin; public DeprecatedPin() {} diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceName.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceName.java index 2dc0ab52e..498c4032b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceName.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceName.java @@ -6,14 +6,14 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; public class DeviceName { @JsonProperty @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; public DeviceName() {} diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationResponse.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationResponse.java index 880ed89b6..fdf72a8b9 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationResponse.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationResponse.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class DirectoryReconciliationResponse { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java index b54af3fd0..a52349cf4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class GcmRegistrationId { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKey.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKey.java index f7102d6e0..d24dc509f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKey.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKey.java @@ -6,8 +6,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; public class PreKey { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKeyState.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKeyState.java index c288af9c2..18b4cab1c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKeyState.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PreKeyState.java @@ -6,12 +6,10 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; 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 javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; public class PreKeyState { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProvisioningMessage.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProvisioningMessage.java index de87597f1..09c857a16 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProvisioningMessage.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProvisioningMessage.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class ProvisioningMessage { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLock.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLock.java index 0a700a7fa..f08ecc7c7 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLock.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLock.java @@ -7,13 +7,13 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; public class RegistrationLock { @JsonProperty - @Length(min=64,max=64) + @Size(min=64, max=64) @NotEmpty private String registrationLock; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/SignedPreKey.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/SignedPreKey.java index 92c8823e3..2b9e301f8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/SignedPreKey.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/SignedPreKey.java @@ -6,7 +6,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; public class SignedPreKey extends PreKey { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/UnregisteredEvent.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/UnregisteredEvent.java index 805857773..a7e58c3bd 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/UnregisteredEvent.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/UnregisteredEvent.java @@ -6,9 +6,8 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; - import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; public class UnregisteredEvent { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LoggingNetworkAppenderFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LoggingNetworkAppenderFactory.java index 27553361f..70425fd4a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LoggingNetworkAppenderFactory.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LoggingNetworkAppenderFactory.java @@ -6,28 +6,26 @@ 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.spi.ILoggingEvent; import ch.qos.logback.classic.util.LevelToSyslogSeverity; import ch.qos.logback.core.Appender; import ch.qos.logback.core.AppenderBase; 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.async.AsyncAppenderFactory; import io.dropwizard.logging.filter.LevelFilterFactory; import io.dropwizard.logging.layout.LayoutFactory; 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") public class LoggingNetworkAppenderFactory extends AbstractAppenderFactory {