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 2021/11/10 15:31:56 UTC
[isis] branch master updated: ISIS-2889: fixes javac build issue on
prev. commit
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 7e44504 ISIS-2889: fixes javac build issue on prev. commit
7e44504 is described below
commit 7e44504671b5fd2d9dfb9d5b6a7dbc9c6b6fc7c2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 10 16:31:49 2021 +0100
ISIS-2889: fixes javac build issue on prev. commit
---
.../rendering/domainobjects/JsonValueEncoder.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
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 daf1c4a..d181486 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
@@ -19,6 +19,7 @@
package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.Map;
+import java.util.Optional;
import java.util.function.Function;
import javax.annotation.PostConstruct;
@@ -145,10 +146,8 @@ public class JsonValueEncoder {
final Object value = ManagedObjects.isNullOrUnspecifiedOrEmpty(objectAdapter)
? NullNode.getInstance()
- : objectSpecification.lookupFacet(ValueFacet.class)
- .<EncoderDecoder>flatMap(ValueFacet::selectDefaultEncoderDecoder)
- .<Object>map(codec->
- codec.toEncodedString(objectAdapter.getPojo()))
+ : toEncodedString(objectSpecification, objectAdapter.getPojo())
+ .map(Object.class::cast)
.orElseGet(()->{
log.warn("{Could not resolve an EncoderDecoder for {}, "
+ "falling back to rendering as 'null'. "
@@ -166,6 +165,13 @@ public class JsonValueEncoder {
}
}
+ private static <T> Optional<String> toEncodedString(final ObjectSpecification spec, final T pojo) {
+ return spec.lookupFacet(ValueFacet.class)
+ .flatMap(ValueFacet::selectDefaultEncoderDecoder)
+ .map(EncoderDecoder.class::cast)
+ .map(codec->((EncoderDecoder<T>)codec).toEncodedString(pojo));
+ }
+
@Nullable
public Object asObject(final @NonNull ManagedObject adapter, final String format) {