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/11/22 19:34:56 UTC
[isis] 01/06: ISIS-2348 HttpError interface name changed
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3f0aff04dc7b8d30a96392a55dd563e0833dd3b0
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Nov 14 11:15:16 2021 +0100
ISIS-2348 HttpError interface name changed
---
.../apache/isis/client/kroviz/core/aggregator/ErrorDispatcher.kt | 5 ++---
.../kotlin/org/apache/isis/client/kroviz/to/PlainTransferObjects.kt | 6 +++---
.../kotlin/org/apache/isis/client/kroviz/ui/dialog/ErrorDialog.kt | 6 ++----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ErrorDispatcher.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ErrorDispatcher.kt
index 5b595c7..6b3a17c 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ErrorDispatcher.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ErrorDispatcher.kt
@@ -20,15 +20,14 @@ package org.apache.isis.client.kroviz.core.aggregator
import org.apache.isis.client.kroviz.core.event.LogEntry
import org.apache.isis.client.kroviz.core.event.ResourceSpecification
-import org.apache.isis.client.kroviz.to.HttpError
-import org.apache.isis.client.kroviz.to.HttpResponse
+import org.apache.isis.client.kroviz.to.HttpErrorResponse
import org.apache.isis.client.kroviz.ui.core.UiManager
import org.apache.isis.client.kroviz.ui.dialog.ErrorDialog
class ErrorDispatcher : BaseAggregator() {
override fun update(logEntry: LogEntry, subType: String) {
- val error = logEntry.getTransferObject() as HttpResponse
+ val error = logEntry.getTransferObject() as HttpErrorResponse
val url = logEntry.url
val message = error.getMessage()
val reSpec = ResourceSpecification(url)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/PlainTransferObjects.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/PlainTransferObjects.kt
index c9e6d14..96c02b6 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/PlainTransferObjects.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/to/PlainTransferObjects.kt
@@ -34,7 +34,7 @@ data class DomainTypes(override val links: List<Link> = emptyList(),
val extensions: Extensions? = null
) : TransferObject, HasLinks
-interface HttpResponse {
+interface HttpErrorResponse {
val detail: HttpErrorDetail?
fun getMessage(): String
fun getStatusCode(): Int
@@ -45,7 +45,7 @@ data class HttpError(
private val httpStatusCode: Int,
private val message: String,
override val detail: HttpErrorDetail? = null
-) : TransferObject, HttpResponse {
+) : TransferObject, HttpErrorResponse {
override fun getMessage() : String {
return message
}
@@ -69,7 +69,7 @@ data class Http401Error(
private val error: String,
private val path: String,
override val detail: HttpErrorDetail? = null
-) : TransferObject, HttpResponse {
+) : TransferObject, HttpErrorResponse {
override fun getMessage(): String {
return error + " / " + path + " / " + timestamp
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ErrorDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ErrorDialog.kt
index 1015516..adf7658 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ErrorDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ErrorDialog.kt
@@ -19,9 +19,7 @@
package org.apache.isis.client.kroviz.ui.dialog
import org.apache.isis.client.kroviz.core.event.LogEntry
-import org.apache.isis.client.kroviz.to.Http401Error
-import org.apache.isis.client.kroviz.to.HttpError
-import org.apache.isis.client.kroviz.to.HttpResponse
+import org.apache.isis.client.kroviz.to.HttpErrorResponse
import org.apache.isis.client.kroviz.to.ValueType
import org.apache.isis.client.kroviz.ui.core.FormItem
import org.apache.isis.client.kroviz.ui.core.RoDialog
@@ -29,7 +27,7 @@ import org.apache.isis.client.kroviz.ui.core.RoDialog
class ErrorDialog(val logEntry: LogEntry) : Command() {
fun open() {
- val error = logEntry.getTransferObject() as HttpResponse
+ val error = logEntry.getTransferObject() as HttpErrorResponse
val formItems = mutableListOf<FormItem>()
formItems.add(FormItem("URL", ValueType.TEXT, logEntry.url))
formItems.add(FormItem("Message", ValueType.TEXT, error.getMessage()))