remove plaintext implementation and organize keyStore implementation …

…to packages (#19)
teragrep · May 29, 2024 · 0e7550a · 0e7550a
1 parent 2a98ae8
commit 0e7550a
Show file tree

Hide file tree

Showing 33 changed files with 85 additions and 517 deletions.
diff --git a/src/main/java/com/teragrep/jai_02/AuthenticationInfo.java b/src/main/java/com/teragrep/jai_02/AuthenticationInfo.java
diff --git a/src/main/java/com/teragrep/jai_02/CredentialLookup.java b/src/main/java/com/teragrep/jai_02/CredentialLookup.java
diff --git a/src/main/java/com/teragrep/jai_02/ICredentialLookup.java b/src/main/java/com/teragrep/jai_02/ICredentialLookup.java
diff --git a/src/main/java/com/teragrep/jai_02/ReloadingCredentialLookup.java b/src/main/java/com/teragrep/jai_02/ReloadingCredentialLookup.java
diff --git a/.../teragrep/jai_02/keystore/EntryAlias.java → ...com/teragrep/jai_02/entry/EntryAlias.java b/.../teragrep/jai_02/keystore/EntryAlias.java → ...com/teragrep/jai_02/entry/EntryAlias.java
@@ -43,7 +43,11 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.jai_02.keystore;
+package com.teragrep.jai_02.entry;
+
+import com.teragrep.jai_02.password.Salt;
+import com.teragrep.jai_02.user.UserName;
+import com.teragrep.jai_02.user.UserNameValid;
 
 import java.util.Objects;
 

diff --git a/...ep/jai_02/keystore/EntryAliasFactory.java → ...agrep/jai_02/entry/EntryAliasFactory.java b/...ep/jai_02/keystore/EntryAliasFactory.java → ...agrep/jai_02/entry/EntryAliasFactory.java
@@ -43,7 +43,11 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.jai_02.keystore;
+package com.teragrep.jai_02.entry;
+
+import com.teragrep.jai_02.password.Salt;
+import com.teragrep.jai_02.password.SaltFactory;
+import com.teragrep.jai_02.user.UserNameImpl;
 
 /**
  * Provides a factory for building EntryAlias objects.

diff --git a/...rep/jai_02/keystore/EntryAliasString.java → ...ragrep/jai_02/entry/EntryAliasString.java b/...rep/jai_02/keystore/EntryAliasString.java → ...ragrep/jai_02/entry/EntryAliasString.java
@@ -43,7 +43,11 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.jai_02.keystore;
+package com.teragrep.jai_02.entry;
+
+import com.teragrep.jai_02.password.Salt;
+import com.teragrep.jai_02.user.UserNameImpl;
+import com.teragrep.jai_02.user.UserNameValid;
 
 import java.util.Base64;
 

diff --git a/...eragrep/jai_02/keystore/KeyAlgorithm.java → ...m/teragrep/jai_02/entry/KeyAlgorithm.java b/...eragrep/jai_02/keystore/KeyAlgorithm.java → ...m/teragrep/jai_02/entry/KeyAlgorithm.java
@@ -1,4 +1,4 @@
-/*
+package com.teragrep.jai_02.entry;/*
  * Java Authentication Info jai_02
  * Copyright (C) 2021  Suomen Kanuuna Oy
  *
@@ -43,7 +43,6 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.jai_02.keystore;
 
 /**
  * An object containing the algorithm used for SecretKeys.

diff --git a/...a/com/teragrep/jai_02/keystore/Split.java → ...java/com/teragrep/jai_02/entry/Split.java b/...a/com/teragrep/jai_02/keystore/Split.java → ...java/com/teragrep/jai_02/entry/Split.java
@@ -1,4 +1,4 @@
-/*
+package com.teragrep.jai_02.entry;/*
  * Java Authentication Info jai_02
  * Copyright (C) 2021  Suomen Kanuuna Oy
  *
@@ -43,7 +43,6 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.jai_02.keystore;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -71,7 +70,7 @@ public String toString() {
         return Character.toString(splitChar);
     }
 
-    Pattern asPattern() {
+    public Pattern asPattern() {
         return pattern;
     }