You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/03/28 16:49:05 UTC
[isis] 02/03: ISIS-2324 import missed packages
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2324-Merge-kroviz
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 21d4d872f34dda8ff05bb2aa6b927e271b120c64
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sat Mar 28 08:24:57 2020 +0100
ISIS-2324 import missed packages
---
.../kroviz/core/aggregator/ActionDispatcher.kt | 22 +++++++++++-----------
.../apache/isis/client/kroviz/core/model/ListDM.kt | 8 +++++---
.../apache/isis/client/kroviz/layout/ActionLt.kt | 2 +-
.../apache/isis/client/kroviz/core/UtilsTest.kt | 11 +++++++----
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ActionDispatcher.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ActionDispatcher.kt
index 1c75b93..da8eaa3 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ActionDispatcher.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ActionDispatcher.kt
@@ -3,6 +3,7 @@ package org.apache.isis.client.kroviz.core.aggregator
import org.apache.isis.client.kroviz.core.event.LogEntry
import org.apache.isis.client.kroviz.to.Action
import org.apache.isis.client.kroviz.to.Link
+import org.apache.isis.client.kroviz.to.Method
import org.apache.isis.client.kroviz.ui.Point
import org.apache.isis.client.kroviz.ui.kv.ActionPrompt
import org.apache.isis.client.kroviz.utils.Utils
@@ -11,23 +12,22 @@ class ActionDispatcher(private val at: Point = Point(100, 100)) : BaseAggregator
override fun update(logEntry: LogEntry, subType: String) {
val action = logEntry.getTransferObject() as Action
- action.links.forEach { link ->
- // it.rel should be neither: (self | up | describedBy )
- if (link.isInvokeAction()) {
- when (link.method) {
- org.apache.isis.client.kroviz.to.Method.GET.name -> processGet(action, link)
- org.apache.isis.client.kroviz.to.Method.POST.name -> processPost(action, link)
- org.apache.isis.client.kroviz.to.Method.PUT.name -> invoke(link)
- }
- }
+ action.links.forEach { link ->
+ // it.rel should be neither: (self | up | describedBy )
+ if (link.isInvokeAction()) {
+ when (link.method) {
+ Method.GET.name -> processGet(action, link)
+ Method.POST.name -> processPost(action, link)
+ Method.PUT.name -> invoke(link)
}
+ }
+ }
}
/**
* link.rel should neither be: (self | up | describedBy )
*/
- private fun Link.isInvokeAction(): Boolean
- {
+ private fun Link.isInvokeAction(): Boolean {
return rel.contains("invoke") && rel.contains("action")
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ListDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ListDM.kt
index 3496607..53e7612 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ListDM.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ListDM.kt
@@ -3,8 +3,10 @@ package org.apache.isis.client.kroviz.core.model
import org.apache.isis.client.kroviz.layout.Layout
import org.apache.isis.client.kroviz.layout.PropertyLt
import org.apache.isis.client.kroviz.layout.RowLt
+import org.apache.isis.client.kroviz.to.Extensions
import org.apache.isis.client.kroviz.to.Property
import org.apache.isis.client.kroviz.to.TObject
+import org.apache.isis.client.kroviz.to.TransferObject
import org.apache.isis.client.kroviz.to.bs3.Grid
import pl.treksoft.kvision.state.observableListOf
@@ -57,14 +59,14 @@ class ListDM(override val title: String) : DisplayModel() {
}
}
- override fun addData(obj: org.apache.isis.client.kroviz.to.TransferObject) {
- val exo = org.apache.isis.client.kroviz.core.model.Exposer(obj as TObject)
+ override fun addData(obj: TransferObject) {
+ val exo = Exposer(obj as TObject)
data.add(exo.dynamise()) //if exposer is not dynamised, data access in tables won't work
}
fun addPropertyDescription(p: Property) {
val id = p.id
- val e: org.apache.isis.client.kroviz.to.Extensions = p.extensions!!
+ val e: Extensions = p.extensions!!
val friendlyName = e.friendlyName
addPropertyDescription(id, friendlyName)
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/layout/ActionLt.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/layout/ActionLt.kt
index 5d53923..452e6df 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/layout/ActionLt.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/layout/ActionLt.kt
@@ -7,7 +7,7 @@ import org.apache.isis.client.kroviz.to.Link
data class ActionLt(var named: String? = "",
var describedAs: String? = "",
var metadataError: String? = "",
- var link:org.apache.isis.client.kroviz.to.Link? = null,
+ var link: Link? = null,
var id: String? = "",
var bookmarking: String? = "",
var cssClass: String? = "",
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/core/UtilsTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/core/UtilsTest.kt
index b4252b4..3e4a14c 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/core/UtilsTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/core/UtilsTest.kt
@@ -1,5 +1,8 @@
package org.apache.isis.client.kroviz.core
+import org.apache.isis.client.kroviz.to.Argument
+import org.apache.isis.client.kroviz.to.Link
+import org.apache.isis.client.kroviz.to.Method
import org.apache.isis.client.kroviz.utils.DateHelper
import org.apache.isis.client.kroviz.utils.Utils
import kotlin.test.Test
@@ -59,12 +62,12 @@ class UtilsTest {
val href = "http://localhost:8080/restful/services/isisApplib.FixtureScriptsDefault/actions/runFixtureScript/invoke"
val rel = "urn:org.restfulobjects:rels/invoke;action='runFixtureScript'"
val type = "application/json;profile='urn:org.restfulobjects:repr-types/object-action'"
- val link = org.apache.isis.client.kroviz.to.Link(method = org.apache.isis.client.kroviz.to.Method.POST.operation, href = href, rel = rel, type = type)
+ val link = Link(method = Method.POST.operation, href = href, rel = rel, type = type)
// val arguments = LinkedHashMap<String, String>() //
// link.setArgument(arguments)
// when
- val body = Utils.argumentsAsBody(link)
+ //val body = Utils.argumentsAsBody(link)
// then
// console.log("[UtilsTest.test_argumentsAsBody]")
@@ -77,7 +80,7 @@ class UtilsTest {
//given
val expected = """"script": {"value": {"href": "http://localhost:8080"}}"""
val value = "http://localhost:8080"
- val arg = org.apache.isis.client.kroviz.to.Argument("script", value)
+ val arg = Argument("script", value)
// when
val actual = Utils.asBody(arg)
// then
@@ -89,7 +92,7 @@ class UtilsTest {
//given
val expected = """"parameters": {"value": ""}"""
val value = ""
- val arg = org.apache.isis.client.kroviz.to.Argument("parameters", value)
+ val arg = Argument("parameters", value)
// when
val actual = Utils.asBody(arg)
// then