[isis] branch master updated: ISIS-2877: purge deprecated Jackson options, as enabled by default anyway

[ahuber]

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 f3cf9af  ISIS-2877: purge deprecated Jackson options, as enabled by 
default anyway
f3cf9af is described below

commit f3cf9af68f528dce3b61afeb3758d3d44c943aaa
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Feb 4 13:28:24 2022 +0100

    ISIS-2877: purge deprecated Jackson options, as enabled by default
    anyway
---
 .../java/org/apache/isis/commons/internal/resources/_Json.java     | 7 -------
 .../metamodel/services/schema/SchemaValueMarshallerAbstract.java   | 2 +-
 .../viewer/resources/serialization/SerializationStrategy.java      | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git 
a/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java 
b/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
index b9dfc05..2bb7540 100644
--- 
a/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
+++ 
b/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
@@ -225,13 +225,6 @@ public class _Json {
         return mapper.registerModule(new JaxbAnnotationModule());
     }
 
-    /** when arrays or map, only non-null values are to be included */
-    public static ObjectMapper onlyIncludeNonNullWhenNonScalar(final 
ObjectMapper mapper) {
-        return mapper
-                .disable(SerializationFeature.WRITE_NULL_MAP_VALUES) // 
doesn't seem to work...
-                .disable(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS);
-    }
-
     @SneakyThrows
     public static String toString(
             final @Nullable Object pojo,
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
index 6906924..2536dd3 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
@@ -74,7 +74,7 @@ implements SchemaValueMarshaller {
                 final ObjectFeature feature,
                 final ValueSemanticsProvider<T> semantics) {
 
-            return of(correspondingClass, feature, 
Optional.ofNullable(semantics),
+            return of(correspondingClass, feature, Optional.of(semantics),
                     semantics!=null
                         ? Optional.ofNullable(semantics.getConverter())
                         : Optional.empty());
diff --git 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
index cb00845..671874f 100644
--- 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
+++ 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
@@ -38,8 +38,7 @@ public enum SerializationStrategy {
         @Override public Object entity(final Object jaxbAnnotatedObject) {
             return _Json.toString(
                     jaxbAnnotatedObject,
-                    _Json::jaxbAnnotationSupport,
-                    _Json::onlyIncludeNonNullWhenNonScalar);
+                    _Json::jaxbAnnotationSupport);
         }
 
     },
@@ -49,7 +48,6 @@ public enum SerializationStrategy {
             return _Json.toString(
                     jaxbAnnotatedObject,
                     _Json::jaxbAnnotationSupport,
-                    _Json::onlyIncludeNonNullWhenNonScalar,
                     _Json::indentedOutput);
         }