Cleanup file based password authenticator

Fix property name in password file docs Add missing config null checks
trinodb · Sep 28, 2020 · 2fa1305 · 2fa1305
1 parent 5961d29
commit 2fa1305
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/presto-docs/src/main/sphinx/security/password-file.rst b/presto-docs/src/main/sphinx/security/password-file.rst
@@ -27,10 +27,10 @@ The following configuration properties are available:
 ==================================== ==============================================
 Property                             Description
 ==================================== ==============================================
-``file.password``                    Path of the password file.
+``file.password-file``               Path of the password file.
 
 ``file.refresh-period``              How often to reload the password file.
-                                     Defaults to ``1m``.
+                                     Defaults to ``5s``.
 
 ``file.auth-token-cache.max-size``   Max number of cached authenticated passwords.
                                      Defaults to ``1000``.

diff --git a/...o-password-authenticators/src/main/java/io/prestosql/plugin/password/file/FileConfig.java b/...o-password-authenticators/src/main/java/io/prestosql/plugin/password/file/FileConfig.java
@@ -19,6 +19,8 @@
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
 
+import javax.validation.constraints.NotNull;
+
 import java.io.File;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -29,6 +31,7 @@ public class FileConfig
     private Duration refreshPeriod = new Duration(5, SECONDS);
     private int authTokenCacheMaxSize = 1000;
 
+    @NotNull
     @FileExists
     public File getPasswordFile()
     {
@@ -43,6 +46,7 @@ public FileConfig setPasswordFile(File passwordFile)
         return this;
     }
 
+    @NotNull
     @MinDuration("1ms")
     public Duration getRefreshPeriod()
     {