MOVE: Package / Files moved + Methods renamed (#212)

* MOVE: Files / Packages * MOVE: B64 to utils * MOVE: Files / renamed methods * FIX: Compile issues * Update JobTestSupport.kt
slatekit · Nov 13, 2019 · e930c35 · e930c35
1 parent 20afd79
commit e930c35
Show file tree

Hide file tree

Showing 90 changed files with 197 additions and 296 deletions.
diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Help.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Help.kt
@@ -18,7 +18,7 @@ import slatekit.apis.tools.docs.ApiVisitOptions
 import slatekit.apis.tools.docs.ApiVisitor
 import slatekit.apis.tools.docs.Doc
 import slatekit.apis.tools.docs.DocUtils
-import slatekit.common.content.Content
+import slatekit.common.types.Content
 import slatekit.common.requests.Request
 import slatekit.results.*
 import slatekit.results.builders.Outcomes

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/hooks/Formats.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/hooks/Formats.kt
@@ -3,9 +3,9 @@ package slatekit.apis.hooks
 import slatekit.apis.ApiRequest
 import slatekit.apis.support.RewriteSupport
 import slatekit.common.Ignore
-import slatekit.common.content.ContentTypeCsv
-import slatekit.common.content.ContentTypeJson
-import slatekit.common.content.ContentTypeProp
+import slatekit.common.types.ContentTypeCsv
+import slatekit.common.types.ContentTypeJson
+import slatekit.common.types.ContentTypeProp
 import slatekit.functions.Input
 import slatekit.results.Outcome
 import slatekit.results.flatMap

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/hooks/Serialize.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/hooks/Serialize.kt
@@ -3,10 +3,10 @@ package slatekit.apis.hooks
 import slatekit.apis.ApiRequest
 import slatekit.apis.ApiResult
 import slatekit.common.Ignore
-import slatekit.common.content.Content
-import slatekit.common.content.ContentTypeCsv
-import slatekit.common.content.ContentTypeJson
-import slatekit.common.content.ContentTypeProp
+import slatekit.common.types.Content
+import slatekit.common.types.ContentTypeCsv
+import slatekit.common.types.ContentTypeJson
+import slatekit.common.types.ContentTypeProp
 import slatekit.functions.Output
 import slatekit.meta.Serialization
 import slatekit.results.Failure

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/support/QueueSupport.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/support/QueueSupport.kt
@@ -2,9 +2,9 @@ package slatekit.apis.support
 
 import slatekit.apis.ApiRequest
 import slatekit.apis.core.Requests
-import slatekit.common.*
 import slatekit.common.queues.QueueSource
 import slatekit.common.Source
+import slatekit.common.utils.Random
 import slatekit.results.Notice
 
 interface QueueSupport {

diff --git a/src/lib/kotlin/slatekit-app/src/main/kotlin/slatekit/app/AppContext.kt b/src/lib/kotlin/slatekit-app/src/main/kotlin/slatekit/app/AppContext.kt
@@ -17,7 +17,7 @@ import slatekit.common.Context
 import slatekit.common.args.Args
 import slatekit.common.conf.Conf
 import slatekit.common.conf.Config
-import slatekit.common.encrypt.B64Java8
+import slatekit.common.utils.B64Java8
 import slatekit.common.encrypt.Encryptor
 import slatekit.common.envs.Env
 import slatekit.common.envs.EnvMode

diff --git a/src/lib/kotlin/slatekit-app/src/main/kotlin/slatekit/app/AppUtils.kt b/src/lib/kotlin/slatekit-app/src/main/kotlin/slatekit/app/AppUtils.kt
@@ -32,7 +32,6 @@ import slatekit.common.io.Uri
 import slatekit.common.io.Uris
 import slatekit.common.log.Logs
 import slatekit.common.log.LogsDefault
-import slatekit.common.log.LogHelper
 import slatekit.common.log.LogLevel
 import slatekit.results.*
 
@@ -93,7 +92,7 @@ object AppUtils {
      */
     fun getLogLevel(args: Args, conf: Conf): LogLevel {
         val level = getConfOverride(args, conf, "log.level", "info")
-        return LogHelper.parseLevel(level)
+        return LogLevel.parse(level)
     }
 
     /**

diff --git a/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CLI.kt b/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CLI.kt
@@ -17,8 +17,8 @@ import java.nio.file.Paths
 import java.util.concurrent.atomic.AtomicReference
 import kotlinx.coroutines.runBlocking
 import slatekit.common.args.Args
-import slatekit.common.content.Content
-import slatekit.common.content.ContentType
+import slatekit.common.types.Content
+import slatekit.common.types.ContentType
 import slatekit.common.info.Folders
 import slatekit.common.info.Info
 import slatekit.common.utils.Loops.doUntil

diff --git a/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CliContext.kt b/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CliContext.kt
@@ -1,7 +1,7 @@
 package slatekit.cli
 
-import slatekit.common.content.Content
-import slatekit.common.content.ContentType
+import slatekit.common.types.Content
+import slatekit.common.types.ContentType
 import slatekit.common.info.Info
 import slatekit.common.io.IO
 import slatekit.common.io.Readln

diff --git a/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CliIO.kt b/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CliIO.kt
@@ -16,8 +16,8 @@ package slatekit.cli
 import java.io.File
 import slatekit.common.console.SemanticText
 import slatekit.common.console.SemanticWrites
-import slatekit.common.content.Content
-import slatekit.common.content.ContentType
+import slatekit.common.types.Content
+import slatekit.common.types.ContentType
 import slatekit.common.io.Files
 import slatekit.common.io.IO
 import slatekit.common.serialization.Serializer

diff --git a/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CliRequest.kt b/src/lib/kotlin/slatekit-cli/src/main/kotlin/slatekit/cli/CliRequest.kt
@@ -6,7 +6,7 @@ import slatekit.common.Inputs
 import slatekit.common.Metadata
 import slatekit.common.io.Uris
 import slatekit.common.args.Args
-import slatekit.common.content.Doc
+import slatekit.common.types.Doc
 import slatekit.common.requests.InputArgs
 import slatekit.common.requests.Request
 import slatekit.common.requests.RequestSupport

diff --git a/src/lib/kotlin/slatekit-cloud/src/main/kotlin/slatekit/cloud/aws/AwsCloudQueue.kt b/src/lib/kotlin/slatekit-cloud/src/main/kotlin/slatekit/cloud/aws/AwsCloudQueue.kt
@@ -17,7 +17,7 @@ import com.amazonaws.auth.AWSCredentials
 import com.amazonaws.services.sqs.AmazonSQSClient
 import com.amazonaws.services.sqs.model.*
 import slatekit.common.DateTime
-import slatekit.common.Random
+import slatekit.common.utils.Random
 import slatekit.common.info.ApiLogin
 import slatekit.common.io.Uris
 import slatekit.common.ext.toStringUtc

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Conversions.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Conversions.kt
@@ -13,7 +13,7 @@
 
 package slatekit.common
 
-import slatekit.common.content.Doc
+import slatekit.common.types.Doc
 //import java.time.*
 import org.threeten.bp.*
 import slatekit.common.io.Uris

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/DateTime.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/DateTime.kt
@@ -17,7 +17,6 @@ package slatekit.common
 import org.threeten.bp.*
 import org.threeten.bp.format.DateTimeFormatter
 import slatekit.common.validations.ValidationFuncs
-//import java.time.format.DateTimeFormatter
 import java.util.*
 
 /**

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Defaults.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Defaults.kt
@@ -3,7 +3,7 @@ package slatekit.common
 import slatekit.common.args.Args
 import slatekit.common.conf.Conf
 import slatekit.common.conf.Config
-import slatekit.common.encrypt.B64Java8
+import slatekit.common.utils.B64Java8
 import slatekit.common.encrypt.Encryptor
 import slatekit.common.envs.Env
 import slatekit.common.envs.EnvMode

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Identity.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Identity.kt
@@ -3,6 +3,11 @@ package slatekit.common
 import slatekit.common.envs.EnvMode
 import java.util.*
 
+/**
+ * Used to identity services / components
+ * name = signup.alerts.job.qat
+ * full = signup.alerts.job.qat.4a3b300b-d0ac-4776-8a9c-31aa75e412b3
+ */
 interface Identity {
     val env :String
     val area:String
@@ -30,7 +35,7 @@ interface Identity {
 
 
 /**
- * Simple Identity used to identity sources / components
+ * Simple Identity used to identity services / components
  * @param area    : area  | dept | org  - logical group 
  * @param service : user1 | job  | svc  - to distinguish multiple agents/users
  * @param agent   : api   | app  | job  - environment

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Source.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Source.kt
@@ -1,5 +1,8 @@
 package slatekit.common
 
+/**
+ * Used to represent the source / origin of a request/item being processed
+ */
 object Sources {
     /**
      * Reference to a parent value
@@ -53,7 +56,9 @@ object Sources {
     const val Web = "web"
 }
 
-
+/**
+ * Used to represent the source / origin of a request/item being processed
+ */
 sealed class Source(val id: String) {
 
     object All   : Source(Sources.All)   // reference to all/any

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Status.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Status.kt
@@ -80,56 +80,3 @@ interface StatusCheck {
      */
     fun isState(status: Status): Boolean = status() == status
 }
-
-
-interface StatusSupport : StatusCheck {
-
-    /**
-     * moves the current state to idle.
-     *
-     * @return
-     */
-    fun start(): Status = transition(Status.Running)
-
-    /**
-     * moves the current state to paused
-     *
-     * @return
-     */
-    fun pause(): Status = transition(Status.Paused)
-
-    /**
-     * moves the current state to stopped.
-     *
-     * @return
-     */
-    fun stop(): Status = transition(Status.Stopped)
-
-    /**
-     * moves the current state to resumed
-     *
-     * @return
-     */
-    fun resume(): Status = transition(Status.Running)
-
-    /**
-     * moves the current state to complete
-     *
-     * @return
-     */
-    fun complete(): Status = transition(Status.Complete)
-
-    /**
-     * moves the current state to failed
-     *
-     * @return
-     */
-    fun fail(): Status = transition(Status.Failed)
-
-    /**
-     * moves this state to the one supplied
-     * @param state
-     * @return
-     */
-    fun transition(state: Status): Status
-}
diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Types.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/Types.kt
@@ -13,14 +13,13 @@
 
 package slatekit.common
 
-import slatekit.common.content.Doc
+import slatekit.common.types.Doc
 import slatekit.common.encrypt.EncDouble
 import slatekit.common.encrypt.EncInt
 import slatekit.common.encrypt.EncLong
 import slatekit.common.encrypt.EncString
 //import java.time.*
 import org.threeten.bp.*
-import slatekit.common.smartvalues.SmartValue
 
 object Types {
 

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/conf/Readme.md b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/conf/Readme.md
@@ -74,7 +74,7 @@ import slatekit.results.Success
 import slatekit.common.conf.ConfFuncs
 import slatekit.common.conf.Config
 import slatekit.common.db.DbCon
-import slatekit.common.encrypt.B64Java8
+import slatekit.common.utils.B64Java8
 import slatekit.common.encrypt.Encryptor
 import slatekit.core.cmds.Cmd
 

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/encrypt/Encryptor.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/encrypt/Encryptor.kt
@@ -13,14 +13,16 @@
 
 package slatekit.common.encrypt
 
+import slatekit.common.utils.B64
+
 /**
  * Provides a simple facade for encryption using AES
  * @param key : The secret key ( must be 16, or 32 bytes long )
  * @param iv : The iv ( must be 16 or 32 bytes long )
  */
 open class Encryptor(private val key: String,
                      private val iv: String,
-                     private val b64:B64) {
+                     private val b64: B64) {
 
     fun encrypt(text: String): String = EncryptorAES.encrypt(key, iv, text, b64)
 

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/encrypt/EncryptorAES.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/encrypt/EncryptorAES.kt
@@ -13,6 +13,7 @@
 
 package slatekit.common.encrypt
 
+import slatekit.common.utils.B64
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
@@ -22,31 +23,23 @@ import javax.crypto.spec.SecretKeySpec
  */
 object EncryptorAES {
 
-    fun encrypt(key: String, iv: String, text: String, b64:B64): String {
+    fun encrypt(key: String, iv: String, text: String, b64: B64): String {
         val ivSpec = IvParameterSpec(iv.toByteArray())
         val keySpec = SecretKeySpec(key.toByteArray(), "AES")
         val cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING")
         cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec)
         val encrypted = cipher.doFinal(text.toByteArray())
         return b64.encode(encrypted.toTypedArray().toByteArray())
-        //return base64Encode(encrypted.toTypedArray())
     }
 
-    fun decrypt(key: String, iv: String, text: String, b64:B64): String {
+    fun decrypt(key: String, iv: String, text: String, b64: B64): String {
         val ivSpec = IvParameterSpec(iv.toByteArray())
         val keySpec = SecretKeySpec(key.toByteArray(), "AES")
         val cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING")
         cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec)
-        //val decoded = base64Decode(text)
         val decoded = b64.decode(text)
         val decryptedBytes = cipher.doFinal(decoded)
         val decrypted = String(decryptedBytes)
         return decrypted
     }
-
-//    private fun base64Encode(bytes: Array<Byte>): String =
-//            Base64.getEncoder().withoutPadding().encodeToString(bytes.toByteArray())
-//
-//    private fun base64Decode(text: String): Array<Byte> =
-//            Base64.getDecoder().decode(text.toByteArray()).toTypedArray()
 }
diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/encrypt/Readme.md b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/encrypt/Readme.md
@@ -66,7 +66,7 @@
 
 // required 
 import slatekit.common.encrypt.Encryptor
-import slatekit.common.encrypt.B64Java8
+import slatekit.common.utils.B64Java8
 
 
 // optional 

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/ext/DateTimeExtensions.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/ext/DateTimeExtensions.kt
@@ -3,7 +3,7 @@ package slatekit.common.ext
 import org.threeten.bp.*
 import org.threeten.bp.format.DateTimeFormatter
 import slatekit.common.DateTimes
-import slatekit.common.Random
+import slatekit.common.utils.Random
 
 
 // ********************************************

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/ids/UUIDs.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/ids/UUIDs.kt
@@ -1,6 +1,6 @@
 package slatekit.common.ids
 
-import slatekit.common.Random
+import slatekit.common.utils.Random
 import java.util.*
 
 

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/io/Uris.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/io/Uris.kt
@@ -1,6 +1,6 @@
 package slatekit.common.io
 
-import slatekit.common.content.Doc
+import slatekit.common.types.Doc
 import java.io.File
 
 

diff --git a/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/log/LogEntry.kt b/src/lib/kotlin/slatekit-common/src/main/kotlin/slatekit/common/log/LogEntry.kt
@@ -17,9 +17,9 @@ import slatekit.common.DateTime
 
 data class LogEntry(
     val name: String = "",
-    val level: LogLevel = Info,
+    val level: LogLevel = LogLevel.Info,
     val msg: String = "",
-    val time: DateTime = DateTime.now(),
     val ex: Exception? = null,
-    val tag: String? = null
+    val tag: String? = null,
+    val time: DateTime = DateTime.now()
 )