MOVE: Components from slatekit.common to slatekit.utils (#324)

* ADD: slatekit-utils * ADD: slatekit-requests * MOVE: slatekit.common paged and smart values to utils * MOVE: slatekit.common.display to utils * MOVE: slatekit.writer to slatekit.utils * MOVE: templates and naming to utils * FIX: Compile issues in tests * FIX: Compile issues in tests * FIX: Compile issues in tests * FIX: Compile issues in tests * MOVE: slatekit.common.requests to requests * FIX: Compile issues * FIX: Compile issues * MOVE: Gets, Puts, Inputs, etc to slatekit.common.values * MOVE: files to slatekit.common.values * PROJECT: New modules utils and requests * MOVE: slatekit.server.common -> core * REMOVE: slatekit.context dependency from request * FIX: New module names and ids * BUILD: Move to 2.5.0 * FIX: References for tracking module
slatekit · Oct 11, 2021 · 8cc16e2 · 8cc16e2
1 parent f1bc59f
commit 8cc16e2
Show file tree

Hide file tree

Showing 239 changed files with 1,471 additions and 546 deletions.
diff --git a/src/ext/kotlin/slatekit-connectors-cli/build.gradle b/src/ext/kotlin/slatekit-connectors-cli/build.gradle
@@ -57,13 +57,17 @@ dependencies {
         compile "com.slatekit:slatekit-results:$slatekit_version"
         compile "com.slatekit:slatekit-common:$slatekit_version"
         compile "com.slatekit:slatekit-context:$slatekit_version"
+        compile "com.slatekit:slatekit-utils:$slatekit_version"
+        compile "com.slatekit:slatekit-requests:$slatekit_version"
         compile "com.slatekit:slatekit-apis:$slatekit_version"
         compile "com.slatekit:slatekit-cli:$slatekit_version"
     } else {
         // */
     compile project(":slatekit-result")
     compile project(":slatekit-common")
     compile project(":slatekit-context")
+    compile project(":slatekit-utils")
+    compile project(":slatekit-requests")
     compile project(":slatekit-apis")
     compile project(":slatekit-cli")
     } //</slatekit_local>

diff --git a/src/ext/kotlin/slatekit-connectors-cli/src/main/kotlin/slatekit/connectors/cli/CliApi.kt b/src/ext/kotlin/slatekit-connectors-cli/src/main/kotlin/slatekit/connectors/cli/CliApi.kt
@@ -20,8 +20,8 @@ import slatekit.cli.*
 import slatekit.common.Source
 import slatekit.common.types.Content
 import slatekit.common.types.ContentType
-import slatekit.common.requests.InputArgs
-import slatekit.common.writer.ConsoleWriter
+import slatekit.requests.InputArgs
+import slatekit.utils.writer.ConsoleWriter
 import slatekit.context.Context
 import slatekit.results.Codes
 import slatekit.results.Status

diff --git a/src/ext/kotlin/slatekit-connectors-entities/build.gradle b/src/ext/kotlin/slatekit-connectors-entities/build.gradle
@@ -57,13 +57,15 @@ dependencies {
         compile "com.slatekit:slatekit-results:$slatekit_version"
         compile "com.slatekit:slatekit-common:$slatekit_version"
         compile "com.slatekit:slatekit-context:$slatekit_version"
+        compile "com.slatekit:slatekit-utils:$slatekit_version"
         compile "com.slatekit:slatekit-db:$slatekit_version"
         compile "com.slatekit:slatekit-entities:$slatekit_version"
     } else {
         // */
     compile project(":slatekit-result")
     compile project(":slatekit-common")
     compile project(":slatekit-context")
+    compile project(":slatekit-utils")
     compile project(":slatekit-db")
     compile project(":slatekit-entities")
     } //</slatekit_local>

diff --git a/...latekit-connectors-entities/src/main/kotlin/slatekit/connectors/entities/AppEntContext.kt b/...latekit-connectors-entities/src/main/kotlin/slatekit/connectors/entities/AppEntContext.kt
@@ -18,12 +18,12 @@ import slatekit.common.args.Args
 import slatekit.common.conf.Config
 import slatekit.common.conf.Conf
 import slatekit.common.data.Connections
-import slatekit.common.utils.B64Java8
+import slatekit.common.convert.B64Java8
 import slatekit.common.crypto.Encryptor
 import slatekit.common.info.*
 import slatekit.common.log.Logs
 import slatekit.common.log.LogsDefault
-import slatekit.common.naming.Namer
+import slatekit.utils.naming.Namer
 import slatekit.context.AppContext
 import slatekit.common.envs.Envs
 import slatekit.context.Context

diff --git a/src/ext/kotlin/version-beta.txt b/src/ext/kotlin/version-beta.txt
@@ -1 +1 @@
-2.4.7
+2.5.0
diff --git a/src/ext/kotlin/version.txt b/src/ext/kotlin/version.txt
@@ -1 +1 @@
-2.4.7
+2.5.0
diff --git a/src/lib/kotlin/build-all.sh b/src/lib/kotlin/build-all.sh
@@ -2,7 +2,9 @@
 # Foundational
 cd slatekit-result        && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s     
 cd slatekit-actors        && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s     
-cd slatekit-common        && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s     
+cd slatekit-common        && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s   
+cd slatekit-utils         && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s   
+cd slatekit-requests      && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s     
 cd slatekit-context       && gradle clean build publish && cd ../ && echo 'sleeping 20s' && sleep 20s     
 
 # Support

diff --git a/src/lib/kotlin/slatekit-apis/build.gradle b/src/lib/kotlin/slatekit-apis/build.gradle
@@ -51,13 +51,17 @@ dependencies {
   if( slatekitSetupViaBinary ) {
       compile "com.slatekit:slatekit-results:$slatekit_version"
       compile "com.slatekit:slatekit-common:$slatekit_version"
+      compile "com.slatekit:slatekit-utils:$slatekit_version"
+      compile "com.slatekit:slatekit-requests:$slatekit_version"
       compile "com.slatekit:slatekit-context:$slatekit_version"
       compile "com.slatekit:slatekit-meta:$slatekit_version"
       compile "com.slatekit:slatekit-serialization:$slatekit_version"
   } else {
       // */
   compile project(":slatekit-result")
   compile project(":slatekit-common")
+  compile project(":slatekit-utils")
+  compile project(":slatekit-requests")
   compile project(":slatekit-context")
   compile project(":slatekit-meta")
   compile project(":slatekit-serialization")

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/ApiRequest.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/ApiRequest.kt
@@ -3,7 +3,7 @@ package slatekit.apis
 import slatekit.apis.core.Auth
 import slatekit.apis.core.Target
 import slatekit.context.Context
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 
 /**
  * @param host : Host running the Apis

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/ApiServer.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/ApiServer.kt
@@ -15,11 +15,11 @@ import slatekit.apis.setup.loadAll
 import slatekit.common.*
 import slatekit.common.ext.numbered
 import slatekit.common.ext.structured
-import slatekit.common.ext.toResponse
+import slatekit.requests.toResponse
 import slatekit.common.log.Logger
-import slatekit.common.requests.CommonRequest
-import slatekit.common.requests.Request
-import slatekit.common.requests.Response
+import slatekit.requests.CommonRequest
+import slatekit.requests.Request
+import slatekit.requests.Response
 import slatekit.context.Context
 import slatekit.meta.*
 import slatekit.serialization.deserializer.Deserializer

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/Settings.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/Settings.kt
@@ -18,8 +18,8 @@ import slatekit.apis.tools.docs.DocConsole
 import slatekit.apis.tools.docs.DocWeb
 import slatekit.common.Source
 import slatekit.common.crypto.Encryptor
-import slatekit.common.naming.Namer
-import slatekit.common.requests.Request
+import slatekit.utils.naming.Namer
+import slatekit.requests.Request
 import slatekit.serialization.deserializer.Deserializer
 
 /**

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Auth.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Auth.kt
@@ -15,7 +15,7 @@ package slatekit.apis.core
 
 import slatekit.apis.AuthMode
 import slatekit.apis.support.RolesSupport
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.results.Notice
 import slatekit.results.Outcome
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Ctx.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Ctx.kt
@@ -15,7 +15,7 @@ package slatekit.apis.core
 import slatekit.apis.ApiRequest
 import slatekit.apis.ApiServer
 import slatekit.context.Context
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 
 data class Ctx(val host: ApiServer, val context: Context, val req: Request, val target: Target) {
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Data.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Data.kt
@@ -20,6 +20,8 @@ import slatekit.common.crypto.Encryptor
 // import java.time.*
 import org.threeten.bp.*
 import slatekit.common.convert.Conversions
+import slatekit.common.values.Inputs
+import slatekit.common.values.InputsUpdateable
 
 /**
  * Used to represent a request that originate from a json file.

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Meta.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Meta.kt
@@ -7,6 +7,7 @@ import slatekit.common.crypto.Encryptor
 // import java.time.*
 import org.threeten.bp.*
 import slatekit.common.convert.Conversions
+import slatekit.common.values.Metadata
 
 /**
  * Used to represent a request that originates from a json file.

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Reqs.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/core/Reqs.kt
@@ -18,11 +18,13 @@ import org.json.simple.parser.JSONParser
 import slatekit.apis.ApiConstants
 import slatekit.apis.support.JsonSupport
 import slatekit.common.*
-import slatekit.common.crypto.Encryptor
 import slatekit.common.ext.toStringUtc
+import slatekit.common.crypto.Encryptor
 import slatekit.common.io.Uris
-import slatekit.common.requests.CommonRequest
-import slatekit.common.requests.Request
+import slatekit.common.values.Inputs
+import slatekit.common.values.Metadata
+import slatekit.requests.CommonRequest
+import slatekit.requests.Request
 import slatekit.serialization.Serialization
 
 object Reqs {
@@ -94,16 +96,16 @@ object Reqs {
         val sep = if (path.contains("/")) "/" else "."
 
         return CommonRequest(
-            version = version,
-            path = path,
-            parts = path.split(sep),
-            source = Source.parse(sourceOverride ?: source),
-            verb = verbOverride ?: verb,
-            meta = Meta(rawSource ?: "json", jsonMeta, enc),
-            data = Data(rawSource ?: "json", Source.File.id, true, enc, jsonData),
-            raw = rawSource,
-            tag = tag,
-            timestamp = time
+                version = version,
+                path = path,
+                parts = path.split(sep),
+                source = Source.parse(sourceOverride ?: source),
+                verb = verbOverride ?: verb,
+                meta = Meta(rawSource ?: "json", jsonMeta, enc),
+                data = Data(rawSource ?: "json", Source.File.id, true, enc, jsonData),
+                raw = rawSource,
+                tag = tag,
+                timestamp = time
         )
     }
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/routes/Action.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/routes/Action.kt
@@ -21,9 +21,9 @@ import slatekit.apis.AuthMode
 import slatekit.apis.Verb
 import slatekit.apis.core.Roles
 import slatekit.apis.core.Sources
-import slatekit.common.Metadata
+import slatekit.common.values.Metadata
 import slatekit.common.ext.tail
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 
 /**
  * ================================================================

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/routes/Routes.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/routes/Routes.kt
@@ -3,7 +3,7 @@ package slatekit.apis.routes
 import slatekit.apis.core.Target
 import kotlin.reflect.full.primaryConstructor
 import slatekit.context.Context
-import slatekit.common.naming.Namer
+import slatekit.utils.naming.Namer
 import slatekit.meta.Reflector
 import slatekit.results.Codes
 import slatekit.results.Err

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/rules/ProtoRule.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/rules/ProtoRule.kt
@@ -4,7 +4,7 @@ import slatekit.apis.ApiRequest
 import slatekit.apis.Verb
 import slatekit.apis.Verbs
 import slatekit.common.Source
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.results.Outcome
 import slatekit.results.builders.Outcomes
 import slatekit.results.flatMap

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/services/Calls.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/services/Calls.kt
@@ -16,8 +16,8 @@ package slatekit.apis.services
 import slatekit.apis.ApiRequest
 import slatekit.apis.core.Target
 import slatekit.apis.routes.Action
-import slatekit.common.*
-import slatekit.common.requests.Request
+import slatekit.common.values.Inputs
+import slatekit.requests.Request
 import slatekit.meta.KTypes
 import slatekit.results.*
 import slatekit.results.builders.Outcomes

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/services/Help.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/services/Help.kt
@@ -19,7 +19,7 @@ import slatekit.apis.routes.Routes
 import slatekit.apis.tools.docs.Doc
 import slatekit.apis.tools.docs.DocUtils
 import slatekit.common.types.Content
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.results.*
 import slatekit.results.builders.Outcomes
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Annotations.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Annotations.kt
@@ -5,7 +5,7 @@ import slatekit.apis.routes.Action
 import slatekit.apis.routes.Api
 import slatekit.apis.routes.Lookup
 import slatekit.common.Ignore
-import slatekit.common.naming.Namer
+import slatekit.utils.naming.Namer
 import slatekit.meta.Reflector
 
 class Annotations(val cls: KClass<*>, val raw: Api? = null) : Loader {

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Loader.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Loader.kt
@@ -2,7 +2,7 @@ package slatekit.apis.setup
 
 import slatekit.apis.routes.Action
 import slatekit.apis.routes.Api
-import slatekit.common.naming.Namer
+import slatekit.utils.naming.Namer
 
 interface Loader {
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Methods.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Methods.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.KVisibility
 import slatekit.apis.routes.Lookup
 import slatekit.apis.routes.Action
 import slatekit.apis.routes.Api
-import slatekit.common.naming.Namer
+import slatekit.utils.naming.Namer
 import slatekit.meta.Reflector
 
 class Methods(val api: Api) : Loader {

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Utils.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/setup/Utils.kt
@@ -12,7 +12,7 @@ import slatekit.apis.routes.Lookup
 import slatekit.apis.routes.Area
 import slatekit.common.Source
 import slatekit.common.ext.orElse
-import slatekit.common.naming.Namer
+import slatekit.utils.naming.Namer
 import slatekit.meta.Reflector
 
 fun toVerb(name: String?): Verb {

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/support/Authenticator.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/support/Authenticator.kt
@@ -6,7 +6,7 @@ import slatekit.apis.core.Roles
 import slatekit.common.auth.AuthFuncs
 import slatekit.common.ext.splitToMapWithPairs
 import slatekit.common.info.ApiKey
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.results.Outcome
 import slatekit.results.builders.Outcomes
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/support/RewriteSupport.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/support/RewriteSupport.kt
@@ -1,7 +1,7 @@
 package slatekit.apis.support
 
 import slatekit.apis.ApiRequest
-import slatekit.common.InputsUpdateable
+import slatekit.common.values.InputsUpdateable
 
 interface RewriteSupport {
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/CodeGen.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/CodeGen.kt
@@ -12,7 +12,7 @@ import slatekit.common.*
 import slatekit.common.ext.orElse
 import slatekit.common.io.Files
 import slatekit.common.io.Uris
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.common.utils.Props
 
 class CodeGen(val settings: CodeGenSettings, val builder:CodeBuilder) {

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/CodeGenApi.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/CodeGenApi.kt
@@ -8,7 +8,7 @@ import slatekit.apis.tools.code.builders.JavaBuilder
 import slatekit.apis.tools.code.builders.KotlinBuilder
 import slatekit.common.*
 import slatekit.common.auth.Roles
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.results.Notice
 
 /**

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/CodeGenSettings.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/CodeGenSettings.kt
@@ -1,7 +1,7 @@
 package slatekit.apis.tools.code
 
 import slatekit.apis.ApiServer
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 
 data class CodeGenSettings(
     val host: ApiServer,

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/TypeInfo.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/code/TypeInfo.kt
@@ -1,7 +1,7 @@
 package slatekit.apis.tools.code
 
 import slatekit.context.Context
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.meta.KTypes
 import kotlin.reflect.KClass
 import kotlin.reflect.KType

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/docs/Doc.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/docs/Doc.kt
@@ -18,9 +18,9 @@ import slatekit.apis.routes.Action
 import slatekit.apis.routes.Api
 import slatekit.apis.routes.Area
 import slatekit.apis.routes.Lookup
-import slatekit.common.writer.ConsoleWriter
-import slatekit.common.writer.TextSettings
-import slatekit.common.writer.Writer
+import slatekit.utils.writer.ConsoleWriter
+import slatekit.utils.writer.TextSettings
+import slatekit.utils.writer.Writer
 import kotlin.reflect.KClass
 
 abstract class Doc  {

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/docs/DocUtils.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/docs/DocUtils.kt
@@ -3,7 +3,7 @@ package slatekit.apis.tools.docs
 import slatekit.apis.ApiConstants
 import slatekit.apis.core.Part
 import slatekit.common.args.ArgsCheck
-import slatekit.common.requests.Request
+import slatekit.requests.Request
 import slatekit.results.Outcome
 import slatekit.results.builders.Outcomes
 

diff --git a/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/docs/DocWeb.kt b/src/lib/kotlin/slatekit-apis/src/main/kotlin/slatekit/apis/tools/docs/DocWeb.kt
@@ -2,8 +2,8 @@ package slatekit.apis.tools.docs
 
 import slatekit.apis.routes.Action
 import slatekit.apis.routes.Api
-import slatekit.common.writer.Writer
-import slatekit.common.writer.WebWriter
+import slatekit.utils.writer.Writer
+import slatekit.utils.writer.WebWriter
 
 /**
  * Generates help docs on the console.