Skip to content

Commit

Permalink
#42 Handle Property
Browse files Browse the repository at this point in the history
  • Loading branch information
joerg-rade committed Jan 23, 2020
1 parent bf59f8d commit cb5a3eb
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 318 deletions.
2 changes: 2 additions & 0 deletions src/main/kotlin/org/ro/core/aggregator/BaseAggregator.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ abstract class BaseAggregator {

protected fun log(logEntry: LogEntry) {
console.log("[BaseAggregator.log] unexpected:\n $logEntry}")
console.log(this::class.simpleName)
console.log(logEntry)
}

fun invoke(link: Link) {
Expand Down
7 changes: 7 additions & 0 deletions src/main/kotlin/org/ro/core/aggregator/ObjectAggregator.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import org.ro.core.event.LogEntry
import org.ro.core.model.DisplayObject
import org.ro.layout.Layout
import org.ro.to.HttpError
import org.ro.to.Property
import org.ro.to.TObject
import org.ro.ui.ErrorAlert
import org.ro.ui.kv.UiManager
Expand All @@ -18,6 +19,7 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {

when (val obj = logEntry.getTransferObject()) {
is TObject -> handleObject(obj)
is Property -> handleProperty(obj)
is Layout -> handleLayout(obj)
is HttpError -> ErrorAlert(logEntry).open()
else -> log(logEntry)
Expand All @@ -40,6 +42,11 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
return dsp.getObject()
}

private fun handleProperty(property: Property) {
console.log("[ObjectAggregator.handleProperty] yet to be implemented")
console.log(property)
}

private fun handleLayout(layout: Layout) {
dsp.layout = layout
layout.properties.forEach {
Expand Down
51 changes: 51 additions & 0 deletions src/test/kotlin/org/ro/snapshots/demo2_0_0/DEMO_PROPERTY.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package org.ro.snapshots.demo2_0_0

import org.ro.snapshots.Response

object DEMO_PROPERTY : Response(){
override val url = "http://localhost:8080/restful/objects/demo.Text/AR-LCAAAAAAAAACFkLEOgkAMhneeorlJB0Xj4nBASIybi9EHOKExF3s9wx0Kby8ERKIkdvrTv_36pzKpDMEDC6ctR2K9XAlAzmyu-RqJ82m_2ApwXnGuyDJGokYnkjiQOzQ2DqAp6XzRTMcKOgGzjHR2A4NzGfbeePBQktekGeMUzFv3u4G7K-ZWbKBtu-UE7QMYY4-ocstUNzmKXg6BLqUHRWSfDjxWHhwSZn4ADquTMQc3_QZPpf1z6pcayLD75QsMtJyWiwEAAA==/properties/string"
override val str = """{
"id": "string",
"memberType": "property",
"links": [
{
"rel": "self",
"href": "http://localhost:8080/restful/objects/demo.Text/AR-LCAAAAAAAAACFkLEOgkAMhneeorlJB0Xj4nBASIybi9EHOKExF3s9wx0Kby8ERKIkdvrTv_36pzKpDMEDC6ctR2K9XAlAzmyu-RqJ82m_2ApwXnGuyDJGokYnkjiQOzQ2DqAp6XzRTMcKOgGzjHR2A4NzGfbeePBQktekGeMUzFv3u4G7K-ZWbKBtu-UE7QMYY4-ocstUNzmKXg6BLqUHRWSfDjxWHhwSZn4ADquTMQc3_QZPpf1z6pcayLD75QsMtJyWiwEAAA==/properties/string",
"method": "GET",
"type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-property\""
},
{
"rel": "up",
"href": "http://localhost:8080/restful/objects/demo.Text/AR-LCAAAAAAAAACFkLEOgkAMhneeorlJB0Xj4nBASIybi9EHOKExF3s9wx0Kby8ERKIkdvrTv_36pzKpDMEDC6ctR2K9XAlAzmyu-RqJ82m_2ApwXnGuyDJGokYnkjiQOzQ2DqAp6XzRTMcKOgGzjHR2A4NzGfbeePBQktekGeMUzFv3u4G7K-ZWbKBtu-UE7QMYY4-ocstUNzmKXg6BLqUHRWSfDjxWHhwSZn4ADquTMQc3_QZPpf1z6pcayLD75QsMtJyWiwEAAA==",
"method": "GET",
"type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object\"",
"title": "TextDemo"
},
{
"rel": "urn:org.restfulobjects:rels/modify;property=\"string\"",
"href": "http://localhost:8080/restful/objects/demo.Text/AR-LCAAAAAAAAACFkLEOgkAMhneeorlJB0Xj4nBASIybi9EHOKExF3s9wx0Kby8ERKIkdvrTv_36pzKpDMEDC6ctR2K9XAlAzmyu-RqJ82m_2ApwXnGuyDJGokYnkjiQOzQ2DqAp6XzRTMcKOgGzjHR2A4NzGfbeePBQktekGeMUzFv3u4G7K-ZWbKBtu-UE7QMYY4-ocstUNzmKXg6BLqUHRWSfDjxWHhwSZn4ADquTMQc3_QZPpf1z6pcayLD75QsMtJyWiwEAAA==/properties/string",
"method": "PUT",
"type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-property\"",
"arguments": {
"value": null
}
},
{
"rel": "urn:org.restfulobjects:rels/clear;property=\"string\"",
"href": "http://localhost:8080/restful/objects/demo.Text/AR-LCAAAAAAAAACFkLEOgkAMhneeorlJB0Xj4nBASIybi9EHOKExF3s9wx0Kby8ERKIkdvrTv_36pzKpDMEDC6ctR2K9XAlAzmyu-RqJ82m_2ApwXnGuyDJGokYnkjiQOzQ2DqAp6XzRTMcKOgGzjHR2A4NzGfbeePBQktekGeMUzFv3u4G7K-ZWbKBtu-UE7QMYY4-ocstUNzmKXg6BLqUHRWSfDjxWHhwSZn4ADquTMQc3_QZPpf1z6pcayLD75QsMtJyWiwEAAA==/properties/string",
"method": "DELETE",
"type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-property\""
},
{
"rel": "describedby",
"href": "http://localhost:8080/restful/domain-types/demo.Text/properties/string",
"method": "GET",
"type": "application/json;profile=\"urn:org.restfulobjects:repr-types/property-description\""
}
],
"value": "a string (click me)",
"extensions": {
"x-isis-format": "string"
}
}"""
}
Loading

0 comments on commit cb5a3eb

Please sign in to comment.