You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/02/10 12:33:24 UTC
[isis] branch master updated: ISIS-2281: fixes ListeningMarkup to
use same value semantics as Markup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c541671 ISIS-2281: fixes ListeningMarkup to use same value semantics as Markup
c541671 is described below
commit c541671a087e0fdbd6ebeb1055d7ec2a561c60c6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 10 13:33:13 2020 +0100
ISIS-2281: fixes ListeningMarkup to use same value semantics as Markup
---
.../apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java | 2 +-
.../restfulobjects/rendering/domainobjects/JsonValueEncoder.java | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
index 4798ca5..b9910ed 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
@@ -11,7 +11,7 @@ import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
*
*/
@Value(semanticsProviderName =
- "MarkupValueSemanticsProvider")
+ "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class ListeningMarkup extends Markup {
private static final long serialVersionUID = 1L;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 120be11..65ad0a6 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.spec.ManagedObject;
@@ -141,13 +142,17 @@ public class JsonValueEncoder {
String format,
boolean suppressExtensions) {
- val jsonValueConverter = converterBySpecId.get(objectSpecification.getSpecId());
+ val specId = objectSpecification.getSpecId();
+ val jsonValueConverter = converterBySpecId.get(specId);
if(jsonValueConverter != null) {
return jsonValueConverter.appendValueAndFormat(objectAdapter, format, repr, suppressExtensions);
} else {
val encodableFacet = objectSpecification.getFacet(EncodableFacet.class);
if (encodableFacet == null) {
- throw new IllegalArgumentException("objectSpec expected to have EncodableFacet");
+ throw _Exceptions.illegalArgument(
+ "objectSpec '%s' expected to have EncodableFacet "
+ + "or a registered JsonValueConverter",
+ specId);
}
Object value = objectAdapter != null
? encodableFacet.toEncodedString(objectAdapter)