From 1dceee3fa01ac3a617c713003e081eef85f25b52 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 4 Feb 2021 17:13:22 -0500
Subject: [PATCH] Make DynamoDBConfiguration more consistent.

---
 .../configuration/DynamoDbConfiguration.java  | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java
index aeee69bdb..1d50aecaf 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DynamoDbConfiguration.java
@@ -8,42 +8,36 @@ package org.whispersystems.textsecuregcm.configuration;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.time.Duration;
 
 public class DynamoDbConfiguration {
 
-    @JsonProperty
-    @NotBlank
-    private String region;
-
-    @JsonProperty
-    @NotBlank
-    private String tableName;
-
-    @JsonProperty
+    private String   region;
+    private String   tableName;
     private Duration clientExecutionTimeout = Duration.ofSeconds(30);
-
-    @JsonProperty
-    private Duration clientRequestTimeout = Duration.ofSeconds(10);
+    private Duration clientRequestTimeout   = Duration.ofSeconds(10);
 
     @Valid
     @NotEmpty
+    @JsonProperty
     public String getRegion() {
         return region;
     }
 
     @Valid
     @NotEmpty
+    @JsonProperty
     public String getTableName() {
         return tableName;
     }
 
+    @JsonProperty
     public Duration getClientExecutionTimeout() {
         return clientExecutionTimeout;
     }
 
+    @JsonProperty
     public Duration getClientRequestTimeout() {
         return clientRequestTimeout;
     }