Integrate @JsonView and correct no-view behaviour (#680)

micronaut-projects · Nov 15, 2023 · d2ad56e · d2ad56e
1 parent c505bd6
commit d2ad56e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 123 deletions.
diff --git a/serde-jackson/src/test/groovy/io/micronaut/serde/jackson/annotation/JsonViewSpec.groovy b/serde-jackson/src/test/groovy/io/micronaut/serde/jackson/annotation/JsonViewSpec.groovy
diff --git a/serde-jackson/src/test/groovy/io/micronaut/serde/jackson/annotation/SerdeJsonViewSpec.groovy b/serde-jackson/src/test/groovy/io/micronaut/serde/jackson/annotation/SerdeJsonViewSpec.groovy
@@ -0,0 +1,6 @@
+package io.micronaut.serde.jackson.annotation
+
+import io.micronaut.serde.jackson.JsonViewSpec
+
+class SerdeJsonViewSpec extends JsonViewSpec {
+}
diff --git a/serde-support/src/main/java/io/micronaut/serde/support/DefaultSerdeRegistry.java b/serde-support/src/main/java/io/micronaut/serde/support/DefaultSerdeRegistry.java
@@ -453,6 +453,9 @@ public Serializer.EncoderContext newEncoderContext(Class<?> view) {
             return new DefaultEncoderContext(this) {
                 @Override
                 public boolean hasView(Class<?>... views) {
+                    if (view == null || view == Object.class) {
+                        return true;
+                    }
                     for (Class<?> candidate : views) {
                         if (candidate.isAssignableFrom(view)) {
                             return true;
@@ -471,6 +474,9 @@ public Deserializer.DecoderContext newDecoderContext(Class<?> view) {
             return new DefaultDecoderContext(this) {
                 @Override
                 public boolean hasView(Class<?>... views) {
+                    if (view == null || view == Object.class) {
+                        return true;
+                    }
                     for (Class<?> candidate : views) {
                         if (candidate.isAssignableFrom(view)) {
                             return true;