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 2021/08/10 07:08:11 UTC
[isis] 01/02: ISIS-2505 object-icon displayed in parented collection
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2505_Catch_Up_With_Demo_Examples
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2f514ec904e70c97129a0f91ba4fe59d1980d441
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Aug 8 14:25:59 2021 +0200
ISIS-2505 object-icon displayed in parented collection
---
.../org/apache/isis/client/kroviz/core/Session.kt | 34 +-----
.../kroviz/core/aggregator/ActionDispatcher.kt | 4 +-
.../client/kroviz/core/event/LogEntryDecorator.kt | 4 +-
.../kroviz/core/event/ResourceSpecification.kt | 6 +-
.../client/kroviz/core/event/RoXmlHttpRequest.kt | 12 +-
.../isis/client/kroviz/core/model/Exposer.kt | 7 +-
.../isis/client/kroviz/handler/IconHandler.kt | 5 +-
.../org/apache/isis/client/kroviz/to/Icon.kt | 4 +-
.../org/apache/isis/client/kroviz/to/Link.kt | 4 +-
.../isis/client/kroviz/ui/builder/ColBuilder.kt | 6 +-
.../isis/client/kroviz/ui/core/ColumnFactory.kt | 4 +-
.../isis/client/kroviz/ui/core/MenuFactory.kt | 6 +-
.../apache/isis/client/kroviz/ui/core/RoIconBar.kt | 6 +-
.../apache/isis/client/kroviz/ui/core/RoTable.kt | 4 +-
.../apache/isis/client/kroviz/ui/core/UiManager.kt | 6 +-
.../isis/client/kroviz/ui/dialog/ActionPrompt.kt | 4 +-
.../isis/client/kroviz/ui/dialog/EventLogDetail.kt | 4 +-
.../isis/client/kroviz/ui/panel/EventLogTable.kt | 4 +-
.../apache/isis/client/kroviz/utils/IconManager.kt | 2 +-
.../apache/isis/client/kroviz/utils/ImgUtils.kt | 6 -
.../kroviz/utils/{Utils.kt => StringUtils.kt} | 48 ++++++--
.../apache/isis/client/kroviz/core/UtilsTest.kt | 10 +-
.../isis/client/kroviz/handler/IconHandlerTest.kt | 127 ++++++++++++++-------
.../org/apache/isis/client/kroviz/to/ActionTest.kt | 4 +-
.../org/apache/isis/client/kroviz/to/IconTest.kt | 79 -------------
.../apache/isis/client/kroviz/to/TObjectTest.kt | 4 +-
26 files changed, 182 insertions(+), 222 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/Session.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/Session.kt
index c8f98f4..eee34ee 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/Session.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/Session.kt
@@ -19,6 +19,7 @@
package org.apache.isis.client.kroviz.core
import org.apache.isis.client.kroviz.ui.core.UiManager
+import org.apache.isis.client.kroviz.utils.StringUtils
/**
* Keep track of connected server.
@@ -37,38 +38,7 @@ class Session {
}
fun getCredentials(): String {
- return "$user:$pw".base64encoded
+ return StringUtils.base64encoded("$user:$pw")
}
- /**
- * https://discuss.kotlinlang.org/t/kotlin-native-base64-en-decoder-code/10043
- */
- private val BASE64_SET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-
- /**
- * Base64 encode a string.
- */
- val String.base64encoded: String
- get() {
- val pad = when (this.length % 3) {
- 1 -> "=="
- 2 -> "="
- else -> ""
- }
- var raw = this
- (1..pad.length).forEach { raw += 0.toChar() }
- return StringBuilder().apply {
- (0 until raw.length step 3).forEach {
- val n: Int = (0xFF.and(raw[it].toInt()) shl 16) +
- (0xFF.and(raw[it + 1].toInt()) shl 8) +
- 0xFF.and(raw[it + 2].toInt())
- listOf<Int>((n shr 18) and 0x3F,
- (n shr 12) and 0x3F,
- (n shr 6) and 0x3F,
- n and 0x3F).forEach { append(BASE64_SET[it]) }
- }
- }.dropLast(pad.length)
- .toString() + pad
- }
-
}
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 e1fc669..aaf1ec0 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
@@ -23,7 +23,7 @@ import org.apache.isis.client.kroviz.to.*
import org.apache.isis.client.kroviz.ui.dialog.ActionPrompt
import org.apache.isis.client.kroviz.ui.core.Constants
import org.apache.isis.client.kroviz.utils.Point
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
class ActionDispatcher(private val at: Point = Point(100, 100)) : BaseAggregator() {
@@ -63,7 +63,7 @@ class ActionDispatcher(private val at: Point = Point(100, 100)) : BaseAggregator
}
private fun invoke(action: Action, link: Link) {
- val title = Utils.deCamel(action.id)
+ val title = StringUtils.deCamel(action.id)
invoke(link, ObjectAggregator(title))
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/LogEntryDecorator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/LogEntryDecorator.kt
index b5655c5..4be00b8 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/LogEntryDecorator.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/LogEntryDecorator.kt
@@ -21,7 +21,7 @@ package org.apache.isis.client.kroviz.core.event
import org.apache.isis.client.kroviz.to.Link
import org.apache.isis.client.kroviz.to.Relation
import org.apache.isis.client.kroviz.ui.core.Constants
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
class LogEntryDecorator(val logEntry: LogEntry) {
@@ -153,7 +153,7 @@ class LogEntryDecorator(val logEntry: LogEntry) {
// strip off protocol, host, port
// val protocolHostPort = UiManager.getUrl()
// result = result.replace(protocolHostPort + signature, "")
- result = Utils.removeHexCode(result)
+ result = StringUtils.removeHexCode(result)
}
return result
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ResourceSpecification.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ResourceSpecification.kt
index e5eadd5..90e8395 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ResourceSpecification.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ResourceSpecification.kt
@@ -19,7 +19,7 @@
package org.apache.isis.client.kroviz.core.event
import org.apache.isis.client.kroviz.ui.core.Constants
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
class ResourceSpecification(
val url: String,
@@ -39,8 +39,8 @@ class ResourceSpecification(
}
private fun areEquivalent(searchUrl: String, compareUrl: String, allowedDiff: Int = 1): Boolean {
- val sl = Utils.removeHexCode(searchUrl)
- val cl = Utils.removeHexCode(compareUrl)
+ val sl = StringUtils.removeHexCode(searchUrl)
+ val cl = StringUtils.removeHexCode(compareUrl)
val searchList: List<String> = sl.split("/")
val compareList: List<String> = cl.split("/")
if (compareList.size != searchList.size) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/RoXmlHttpRequest.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/RoXmlHttpRequest.kt
index 468889e..16c0d29 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/RoXmlHttpRequest.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/RoXmlHttpRequest.kt
@@ -26,9 +26,8 @@ import org.apache.isis.client.kroviz.to.Method
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.ui.core.Constants
import org.apache.isis.client.kroviz.ui.core.UiManager
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import org.w3c.xhr.BLOB
-import org.w3c.xhr.TEXT
import org.w3c.xhr.XMLHttpRequest
import org.w3c.xhr.XMLHttpRequestResponseType
@@ -64,7 +63,7 @@ class RoXmlHttpRequest {
val method = link.method
var url = link.href
if (method != Method.POST.operation) {
- url += Utils.argumentsAsUrlParameter(link)
+ url += StringUtils.argumentsAsUrlParameter(link)
}
val credentials: String = UiManager.getCredentials()
@@ -74,7 +73,6 @@ class RoXmlHttpRequest {
xhr.setRequestHeader(CONTENT_TYPE, "application/$subType;charset=UTF-8")
xhr.setRequestHeader(ACCEPT, "application/$subType, ${Constants.pngMimeType}")
if (url.endsWith("object-icon")) {
-// xhr.overrideMimeType("text/plain; charset=x-user-defined")
xhr.responseType = XMLHttpRequestResponseType.BLOB
}
@@ -90,11 +88,11 @@ class RoXmlHttpRequest {
private fun buildBody(link: Link, aggregator: BaseAggregator?): String {
return when {
- link.hasArguments() -> Utils.argumentsAsBody(link)
+ link.hasArguments() -> StringUtils.argumentsAsBody(link)
link.method == Method.PUT.operation -> {
val logEntry = EventStore.findBy(aggregator!!)
when (val obj = logEntry?.obj) {
- is TObject -> Utils.propertiesAsBody(obj)
+ is TObject -> StringUtils.propertiesAsBody(obj)
else -> ""
}
}
@@ -119,7 +117,7 @@ class RoXmlHttpRequest {
xhr.setRequestHeader(CONTENT_TYPE, Constants.stdMimeType)
xhr.setRequestHeader(ACCEPT, Constants.svgMimeType)
- val body = Utils.argumentsAsList(link)
+ val body = StringUtils.argumentsAsList(link)
xhr.send(body)
val rs = buildResourceSpecificationAndSetupHandler(url, subType, body, xhr)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/Exposer.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/Exposer.kt
index 01e914e..386a5d1 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/Exposer.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/Exposer.kt
@@ -19,10 +19,10 @@
package org.apache.isis.client.kroviz.core.model
import kotlinx.serialization.Serializable
+import org.apache.isis.client.kroviz.to.Icon
import org.apache.isis.client.kroviz.to.MemberType
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.utils.IconManager
-import org.w3c.dom.Image
/**
* Makes properties of delegate available for display in Lists.
@@ -61,9 +61,8 @@ class Exposer(val delegate: TObject) {
return this.delegate.getProperty(propertyName)?.value
}
- fun setIcon(value: Image) {
- val thys = this.asDynamic()
- thys["icon"] = value.src
+ fun setIcon(icon: Icon) {
+ this.asDynamic()["icon"] = icon.image.src
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/IconHandler.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/IconHandler.kt
index 60fb9f0..8ad33cf 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/IconHandler.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/IconHandler.kt
@@ -21,6 +21,7 @@ package org.apache.isis.client.kroviz.handler
import org.apache.isis.client.kroviz.to.Icon
import org.apache.isis.client.kroviz.to.TransferObject
import org.apache.isis.client.kroviz.ui.core.Constants
+import org.apache.isis.client.kroviz.utils.ImgUtils
class IconHandler : BaseHandler() {
@@ -33,7 +34,9 @@ class IconHandler : BaseHandler() {
}
override fun parse(response: String): TransferObject {
- return Icon(logEntry.blob!!)
+ val blob = logEntry.blob!!
+ val image = ImgUtils.toImage(blob)
+ return Icon(image)
}
override fun update() {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Icon.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Icon.kt
index 627aa4f..2d282c3 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Icon.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Icon.kt
@@ -2,7 +2,7 @@ package org.apache.isis.client.kroviz.to
import kotlinx.serialization.Contextual
import kotlinx.serialization.Serializable
-import org.w3c.files.Blob
+import org.w3c.dom.Image
@Serializable
-data class Icon(@Contextual val resource: Blob) : TransferObject
+data class Icon(@Contextual val image: Image) : TransferObject
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt
index 5b41f43..d110f94 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/Link.kt
@@ -19,7 +19,7 @@
package org.apache.isis.client.kroviz.to
import kotlinx.serialization.Serializable
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
@Serializable
data class Link(val rel: String = "",
@@ -46,7 +46,7 @@ data class Link(val rel: String = "",
}
fun setArgument(key: String, value: String?) {
- val k = Utils.enCamel(key)
+ val k = StringUtils.enCamel(key)
val arg = argMap()!!.get(k)
arg!!.key = k
arg.value = value
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt
index 632a8ba..02f9ac5 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt
@@ -28,7 +28,7 @@ import org.apache.isis.client.kroviz.to.bs3.Col
import org.apache.isis.client.kroviz.ui.core.MenuFactory
import org.apache.isis.client.kroviz.ui.core.RoDisplay
import org.apache.isis.client.kroviz.ui.core.RoTable
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import kotlin.math.round
class ColBuilder : UiBuilder() {
@@ -53,7 +53,7 @@ class ColBuilder : UiBuilder() {
if (legend.trim().length == 0) {
legend = fs.id
}
- legend = Utils.capitalize(legend)
+ legend = StringUtils.capitalize(legend)
val fsPanel = FieldsetPanel(legend = legend).add(fsCpt)
val tto = TooltipOptions(title = fs.id)
fsPanel.enableTooltip(tto)
@@ -70,7 +70,7 @@ class ColBuilder : UiBuilder() {
val objectDM = dsp.displayModel
val collectionDM = objectDM.collections.get(key)!!
val tblCpt = RoTable(collectionDM)
- val fsPanel = FieldsetPanel(legend = Utils.capitalize(key)).add(tblCpt)
+ val fsPanel = FieldsetPanel(legend = StringUtils.capitalize(key)).add(tblCpt)
panel.add(fsPanel)
collectionDM.isRendered = true
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/ColumnFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/ColumnFactory.kt
index 91135d3..42f2a4b 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/ColumnFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/ColumnFactory.kt
@@ -24,7 +24,6 @@ import io.kvision.tabulator.Editor
import io.kvision.tabulator.Formatter
import org.apache.isis.client.kroviz.core.model.CollectionDM
import org.apache.isis.client.kroviz.core.model.Exposer
-import org.apache.isis.client.kroviz.utils.ImgUtils
/**
* Create ColumnDefinitions for Tabulator tables
@@ -62,8 +61,7 @@ class ColumnFactory {
val icon = displayCollection.icon
model.forEach { exposer ->
if (icon != null) {
- val image = ImgUtils.toImage(icon.resource)
- exposer.setIcon(image)
+ exposer.setIcon(icon)
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/MenuFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/MenuFactory.kt
index 03df4db..d89dbf9 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/MenuFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/MenuFactory.kt
@@ -27,7 +27,7 @@ import org.apache.isis.client.kroviz.to.mb.Menu
import org.apache.isis.client.kroviz.to.mb.MenuEntry
import org.apache.isis.client.kroviz.to.mb.Menubars
import org.apache.isis.client.kroviz.utils.IconManager
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import io.kvision.core.Component
import io.kvision.dropdown.DropDown
import io.kvision.dropdown.separator
@@ -116,7 +116,7 @@ object MenuFactory {
val menu = findMenuByTitle(menuTitle)!!
menu.section.forEachIndexed { _, section ->
section.serviceAction.forEach { sa ->
- val saTitle = Utils.deCamel(sa.id!!)
+ val saTitle = StringUtils.deCamel(sa.id!!)
if (saTitle == actionTitle) {
val action = buildActionLink(sa.id, menuTitle)
action.label = ""
@@ -133,7 +133,7 @@ object MenuFactory {
fun buildActionLink(
label: String,
menuTitle: String): KvisionHtmlLink {
- val actionTitle = Utils.deCamel(label)
+ val actionTitle = StringUtils.deCamel(label)
val actionLink: KvisionHtmlLink = ddLink(
label = actionTitle,
icon = IconManager.find(label),
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoIconBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoIconBar.kt
index 805d1cc..0d98ec5 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoIconBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoIconBar.kt
@@ -26,7 +26,7 @@ import org.apache.isis.client.kroviz.core.model.Exposer
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.ui.core.MenuFactory.buildForTitle
import org.apache.isis.client.kroviz.utils.IconManager
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import io.kvision.core.CssSize
import io.kvision.core.UNIT
import io.kvision.core.Widget
@@ -47,7 +47,7 @@ object RoIconBar : SimplePanel() {
add(createDeleteIcon())
panel.setDropTargetData(Constants.stdMimeType) { id ->
when {
- Utils.isUrl(id!!) ->
+ StringUtils.isUrl(id!!) ->
add(createObjectIcon(id)!!)
id.contains(Constants.actionSeparator) ->
add(createActionIcon(id))
@@ -114,7 +114,7 @@ object RoIconBar : SimplePanel() {
tObject = obj,
iconName = iconName,
withText = false)
- var title = Utils.extractTitle(logEntry.title)
+ var title = StringUtils.extractTitle(logEntry.title)
title += "\n${obj.title}"
initIcon(icon, url, title, "icon-bar-object", icon.buttonId()!!)
icon
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoTable.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoTable.kt
index ed32a05..078ddd4 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoTable.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoTable.kt
@@ -29,7 +29,7 @@ import io.kvision.tabulator.TabulatorOptions
import io.kvision.utils.set
import org.apache.isis.client.kroviz.core.model.CollectionDM
import org.apache.isis.client.kroviz.core.model.Exposer
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
/**
* access attributes from dynamic (JS) objects with varying
@@ -40,7 +40,7 @@ import org.apache.isis.client.kroviz.utils.Utils
class RoTable(displayCollection: CollectionDM) : SimplePanel() {
init {
- title = Utils.extractTitle(displayCollection.title)
+ title = StringUtils.extractTitle(displayCollection.title)
width = CssSize(100, UNIT.perc)
val model = displayCollection.data
val columns = ColumnFactory().buildColumns(
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
index 7809922..51c7393 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
@@ -40,7 +40,7 @@ import org.apache.isis.client.kroviz.ui.kv.override.RoTab
import org.apache.isis.client.kroviz.utils.DomUtil
import org.apache.isis.client.kroviz.utils.ScalableVectorGraphic
import org.apache.isis.client.kroviz.utils.UUID
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import org.w3c.dom.events.KeyboardEvent
/**
@@ -133,7 +133,7 @@ object UiManager {
fun openCollectionView(aggregator: BaseAggregator) {
val displayable = aggregator.dpm
- val title: String = Utils.extractTitle(displayable.title)
+ val title: String = StringUtils.extractTitle(displayable.title)
val panel = RoTable(displayable as CollectionDM)
add(title, panel, aggregator)
displayable.isRendered = true
@@ -141,7 +141,7 @@ object UiManager {
fun openObjectView(aggregator: ObjectAggregator) {
val dm = aggregator.dpm as ObjectDM
- var title: String = Utils.extractTitle(dm.title)
+ var title: String = StringUtils.extractTitle(dm.title)
if (title.isEmpty()) {
title = aggregator.actionTitle
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ActionPrompt.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ActionPrompt.kt
index c177e54..aafb462 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ActionPrompt.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ActionPrompt.kt
@@ -24,7 +24,7 @@ import org.apache.isis.client.kroviz.to.Parameter
import org.apache.isis.client.kroviz.to.ValueType
import org.apache.isis.client.kroviz.ui.core.FormItem
import org.apache.isis.client.kroviz.utils.Point
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import io.kvision.core.StringPair
import io.kvision.form.select.SimpleSelect
import io.kvision.form.text.TextArea
@@ -49,7 +49,7 @@ class ActionPrompt(val action: Action) : Command() {
}
private fun buildLabel(): String {
- val label = Utils.deCamel(action.id)
+ val label = StringUtils.deCamel(action.id)
return "Execute: $label"
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt
index 7059c30..f73a26a 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt
@@ -30,7 +30,7 @@ import org.apache.isis.client.kroviz.ui.core.FormItem
import org.apache.isis.client.kroviz.ui.core.RoDialog
import org.apache.isis.client.kroviz.ui.diagram.JsonDiagram
import org.apache.isis.client.kroviz.ui.diagram.LayoutDiagram
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import org.apache.isis.client.kroviz.utils.XmlHelper
class EventLogDetail(val logEntryFromTabulator: LogEntry) : Command() {
@@ -49,7 +49,7 @@ class EventLogDetail(val logEntryFromTabulator: LogEntry) : Command() {
fun open() {
val responseStr = if (logEntry.subType == Constants.subTypeJson) {
- Utils.format(logEntry.response)
+ StringUtils.format(logEntry.response)
} else {
XmlHelper.format(logEntry.response)
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/panel/EventLogTable.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/panel/EventLogTable.kt
index e698973..5eac719 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/panel/EventLogTable.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/panel/EventLogTable.kt
@@ -31,7 +31,7 @@ import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.ui.core.Constants
import org.apache.isis.client.kroviz.ui.core.UiManager
import org.apache.isis.client.kroviz.ui.dialog.EventLogDetail
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
class EventLogTable(val model: List<LogEntry>) : VPanel() {
val tabulator: Tabulator<LogEntry>
@@ -120,7 +120,7 @@ class EventLogTable(val model: List<LogEntry>) : VPanel() {
// strip off protocol, host, port
val protocolHostPort = UiManager.getUrl()
result = result.replace(protocolHostPort + signature, "")
- result = Utils.removeHexCode(result)
+ result = StringUtils.removeHexCode(result)
}
return result
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt
index 68f89bc..5f4c974 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/IconManager.kt
@@ -102,7 +102,7 @@ object IconManager {
@OptIn(ExperimentalStdlibApi::class)
fun find(query: String): String {
if (query.startsWith("fa")) return query
- val actionTitle = Utils.deCamel(query)
+ val actionTitle = StringUtils.deCamel(query)
val mixedCaseList = actionTitle.split(" ")
for (w in mixedCaseList) {
val hit = word2Icon[w]
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/ImgUtils.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/ImgUtils.kt
index 8599c29..267d190 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/ImgUtils.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/ImgUtils.kt
@@ -18,7 +18,6 @@
*/
package org.apache.isis.client.kroviz.utils
-import kotlinx.browser.window
import org.w3c.dom.Image
import org.w3c.dom.url.URL
import org.w3c.files.Blob
@@ -27,13 +26,8 @@ object ImgUtils {
fun toImage(blob: Blob): Image {
val url = URL.createObjectURL(blob)
- console.log(url)
- window.open(url)
-
val image = Image()
image.src = url
- console.log(image)
-
return image
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/Utils.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/StringUtils.kt
similarity index 80%
rename from incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/Utils.kt
rename to incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/StringUtils.kt
index 3c08788..311b8d7 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/Utils.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/StringUtils.kt
@@ -22,7 +22,7 @@ import org.apache.isis.client.kroviz.to.Argument
import org.apache.isis.client.kroviz.to.Link
import org.apache.isis.client.kroviz.to.TObject
-object Utils {
+object StringUtils {
fun enCamel(input: String): String {
var output = ""
@@ -112,10 +112,10 @@ object Utils {
}
internal fun argumentsAsString(
- args: Map<String, Argument?>?,
- start: String,
- sep: String,
- end: String
+ args: Map<String, Argument?>?,
+ start: String,
+ sep: String,
+ end: String
): String {
return if (args.isNullOrEmpty()) "" else {
var answer = start
@@ -130,10 +130,10 @@ object Utils {
}
internal fun argumentsAsList(
- args: Map<String, Argument?>?,
- start: String,
- sep: String,
- end: String
+ args: Map<String, Argument?>?,
+ start: String,
+ sep: String,
+ end: String
): String {
return if (args.isNullOrEmpty()) "" else {
var answer = start
@@ -179,4 +179,34 @@ object Utils {
return if (len > 2) strList[len - 2] else ""
}
+ /**
+ * https://discuss.kotlinlang.org/t/kotlin-native-base64-en-decoder-code/10043
+ */
+ private val BASE64_SET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+ /**
+ * Base64 encode a string.
+ */
+ fun base64encoded(s: String): String {
+ val pad = when (s.length % 3) {
+ 1 -> "=="
+ 2 -> "="
+ else -> ""
+ }
+ var raw = s
+ (1..pad.length).forEach { raw += 0.toChar() }
+ return StringBuilder().apply {
+ (0 until raw.length step 3).forEach {
+ val n: Int = (0xFF.and(raw[it].toInt()) shl 16) +
+ (0xFF.and(raw[it + 1].toInt()) shl 8) +
+ 0xFF.and(raw[it + 2].toInt())
+ listOf<Int>((n shr 18) and 0x3F,
+ (n shr 12) and 0x3F,
+ (n shr 6) and 0x3F,
+ n and 0x3F).forEach { append(BASE64_SET[it]) }
+ }
+ }.dropLast(pad.length)
+ .toString() + pad
+ }
+
}
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 b1f06be..0ee1988 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
@@ -22,7 +22,7 @@ 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 org.apache.isis.client.kroviz.utils.StringUtils
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
@@ -35,7 +35,7 @@ class UtilsTest {
val word = "OK"
val expected = "OK"
//when
- val actual = Utils.deCamel(word)
+ val actual = StringUtils.deCamel(word)
//
assertEquals(expected, actual)
}
@@ -85,7 +85,7 @@ class UtilsTest {
//link.setArgument(arguments)
// when
- val body = Utils.argumentsAsBody(link) //TODO link seems to be null
+ val body = StringUtils.argumentsAsBody(link) //TODO link seems to be null
// then
// console.log("[UtilsTest.test_argumentsAsBody]")
@@ -100,7 +100,7 @@ class UtilsTest {
val value = "http://localhost:8080"
val arg = Argument("script", value)
// when
- val actual = Utils.asBody(arg)
+ val actual = StringUtils.asBody(arg)
// then
assertEquals(expected, actual)
}
@@ -112,7 +112,7 @@ class UtilsTest {
val value = ""
val arg = Argument("parameters", value)
// when
- val actual = Utils.asBody(arg)
+ val actual = StringUtils.asBody(arg)
// then
assertEquals(expected, actual)
}
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/handler/IconHandlerTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/handler/IconHandlerTest.kt
index cf5c433..76a7c9d 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/handler/IconHandlerTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/handler/IconHandlerTest.kt
@@ -1,40 +1,87 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.client.kroviz.handler
-
-import io.kvision.html.Button
-import org.apache.isis.client.kroviz.snapshots.demo2_0_0.OBJECT_ICON
-import kotlin.test.Test
-
-class IconHandlerTest {
-
- @Test
- fun testParse() {
- val payload = OBJECT_ICON.str
- val icon = IconHandler().parse(payload)
- val dynIcon = icon.asDynamic()
- val b = Button("Button")
- b.image = dynIcon
- console.log("[IHT.testParse]")
- console.log(dynIcon.toString())
-// assertTrue(b.image is Icon)
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.client.kroviz.handler
+
+import io.kvision.html.Image
+import kotlinx.browser.window
+import org.apache.isis.client.kroviz.IntegrationTest
+import org.apache.isis.client.kroviz.snapshots.demo2_0_0.OBJECT_ICON
+import org.apache.isis.client.kroviz.to.Icon
+import org.w3c.dom.url.URL
+import org.w3c.files.Blob
+import org.w3c.files.BlobPropertyBag
+import kotlin.test.Test
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
+
+class IconHandlerTest : IntegrationTest() {
+
+ @Test
+ fun handleTest() {
+ if (isAppAvailable()) {
+ //given
+ val logEntry = mockResponse(OBJECT_ICON, null)
+
+ //when
+ val handler = IconHandler()
+ handler.handle(logEntry)
+ val icon = handler.parse("") as Icon
+ val image = icon.image
+
+ //then
+ assertTrue(image.sizes != "")
+ console.log("[IHT.handleTest]")
+ console.log(image.sizes)
+ }
+ }
+
+ //@Test
+ fun testInline() {
+ val VMT = "\$vmT"
+ val str = """
+"�PNG
+
+
+IHDR�w=�sBIT|d� pHYs��~�tEXtSoftwareAdobe Fireworks CS5q��6_IDATH���i�0�?��7${'$'}��TP�
+�N���
+���l�����C�Z�bZ�P�c,_�s����� ���@+9"`���/ �${'$'}+�ߴ0ƴ�����ɽ'�w
+,���a�{G v${VMT}�6��N ��C_�Mwbұ�J+P�[��Իf��P����B+�
+�'��h20IVo��+{��{`�IV�ZI=�Ⱥ\k��߹u�G���${'$'}+�ǡ+_���6�Y�ӡ}>���7���?8;hZ�N'sL�kA+����w+`���h\���]�����iȂ�!�����ֆ���Q�6�.�̨�U�����0b&bs�:���o�맺y��IEND�B`�"
+"""
+ val ba = ByteArray(str.length)
+ str.forEachIndexed { index, char ->
+ ba.set(index, char.toByte())
+ }
+ console.log(ba.toString())
+ val options = BlobPropertyBag()
+ options.type = "image/png"
+ val blob = Blob(ba.asDynamic(), options)
+ console.log(ba.size.toString())
+ console.log(blob.size.toString())
+ assertNotEquals(blob.size, ba.size)
+
+ val url = URL.createObjectURL(blob)
+ val image = Image(url)
+ console.log(url)
+ window.open(url)
+ }
+
+
+}
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/ActionTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/ActionTest.kt
index c189aff..9dc0c4a 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/ActionTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/ActionTest.kt
@@ -25,7 +25,7 @@ import org.apache.isis.client.kroviz.core.event.ResourceSpecification
import org.apache.isis.client.kroviz.core.event.RoXmlHttpRequest
import org.apache.isis.client.kroviz.handler.ActionHandler
import org.apache.isis.client.kroviz.snapshots.simpleapp1_16_0.*
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
@@ -58,7 +58,7 @@ class ActionTest : IntegrationTest() {
val arg = Argument(href)
arguments.put("script", arg)
//ensure link arguments make up valid json body
- val body = Utils.argumentsAsBody(link)
+ val body = StringUtils.argumentsAsBody(link)
console.log(body)
val json = JSON.parse<Argument>(body)
console.log(json)
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/IconTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/IconTest.kt
deleted file mode 100644
index 8230b3c..0000000
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/IconTest.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.client.kroviz.to
-
-import io.kvision.html.Image
-import kotlinx.browser.window
-import org.apache.isis.client.kroviz.handler.IconHandler
-import org.apache.isis.client.kroviz.snapshots.demo2_0_0.OBJECT_ICON
-import org.apache.isis.client.kroviz.utils.ImgUtils
-import org.w3c.dom.url.URL
-import org.w3c.files.Blob
-import org.w3c.files.BlobPropertyBag
-import kotlin.test.Test
-import kotlin.test.assertNotEquals
-import kotlin.test.assertNotNull
-
-class IconTest {
-
- @Test
- fun testParse() {
- //given
- val responseStr = OBJECT_ICON.str
-
- // when
- val icon = IconHandler().parse(responseStr) as Icon
- val image = ImgUtils.toImage(icon.resource)
-
- // then
- assertNotNull(image)
- }
-
- @Test
- fun testInline() {
- val VMT = "\$vmT"
- val str = """
-"�PNG
-
-
-IHDR�w=�sBIT|d� pHYs��~�tEXtSoftwareAdobe Fireworks CS5q��6_IDATH���i�0�?��7${'$'}��TP�
-�N���
-���l�����C�Z�bZ�P�c,_�s����� ���@+9"`���/ �${'$'}+�ߴ0ƴ�����ɽ'�w
-,���a�{G v${VMT}�6��N ��C_�Mwbұ�J+P�[��Իf��P����B+�
-�'��h20IVo��+{��{`�IV�ZI=�Ⱥ\k��߹u�G���${'$'}+�ǡ+_���6�Y�ӡ}>���7���?8;hZ�N'sL�kA+����w+`���h\���]�����iȂ�!�����ֆ���Q�6�.�̨�U�����0b&bs�:���o�맺y��IEND�B`�"
-"""
- val ba = ByteArray(str.length)
- str.forEachIndexed { index, char ->
- ba.set(index, char.toByte())
- }
- console.log(ba.toString())
- val options = BlobPropertyBag()
- options.type = "image/png"
- val blob = Blob(ba.asDynamic(), options)
- console.log(ba.size.toString())
- console.log(blob.size.toString())
- assertNotEquals(blob.size, ba.size)
-
- val url = URL.createObjectURL(blob)
- val image = Image(url)
- console.log(url)
- window.open(url)
- }
-
-}
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/TObjectTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/TObjectTest.kt
index 4b5f9ec..6e94ba9 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/TObjectTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/to/TObjectTest.kt
@@ -23,7 +23,7 @@ import org.apache.isis.client.kroviz.snapshots.demo2_0_0.ACTIONS_STRINGS_INVOKE
import org.apache.isis.client.kroviz.snapshots.demo2_0_0.ACTIONS_TEXT_INVOKE
import org.apache.isis.client.kroviz.snapshots.demo2_0_0.ISIS_SECURITY_ME_SERVICE
import org.apache.isis.client.kroviz.snapshots.simpleapp1_16_0.SO_0
-import org.apache.isis.client.kroviz.utils.Utils
+import org.apache.isis.client.kroviz.utils.StringUtils
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
@@ -56,7 +56,7 @@ class TObjectTest {
//when
mutable.first().value!!.content = "l on the hill"
//then
- val putBody = Utils.propertiesAsBody(tObject)
+ val putBody = StringUtils.propertiesAsBody(tObject)
assertTrue(putBody.contains("notes"))
assertTrue(putBody.contains("value"))
assertTrue(putBody.contains("l on the hill"))