Merge 1d0bbee into 5de61b9

infobip · Apr 16, 2021 · 6de91bb · 6de91bb
2 parents 5de61b9 + 1d0bbee
commit 6de91bb
Show file tree

Hide file tree

Showing 14 changed files with 246 additions and 37 deletions.
diff --git a/infobip-jackson-extension-module/src/main/java/com/infobip/jackson/InfobipJacksonModule.java b/infobip-jackson-extension-module/src/main/java/com/infobip/jackson/InfobipJacksonModule.java
@@ -8,5 +8,6 @@ public class InfobipJacksonModule extends SimpleModule {
     public void setupModule(SetupContext context) {
         super.setupModule(context);
         context.insertAnnotationIntrospector(new InfobipJacksonAnnotationIntrospector());
+        context.insertAnnotationIntrospector(new SingleArgumentPropertiesCreatorModeAnnotationIntrospector());
     }
-}
+}
diff --git a/...n/java/com/infobip/jackson/SingleArgumentPropertiesCreatorModeAnnotationIntrospector.java b/...n/java/com/infobip/jackson/SingleArgumentPropertiesCreatorModeAnnotationIntrospector.java
@@ -0,0 +1,56 @@
+package com.infobip.jackson;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.cfg.MapperConfig;
+import com.fasterxml.jackson.databind.introspect.*;
+
+import java.lang.reflect.Field;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+public class SingleArgumentPropertiesCreatorModeAnnotationIntrospector extends NopAnnotationIntrospector {
+
+    @Override
+    public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated a) {
+        if (!(a instanceof AnnotatedConstructor)) {
+            return null;
+        }
+
+        AnnotatedConstructor annotatedConstructor = (AnnotatedConstructor) a;
+
+        if (annotatedConstructor.getParameterCount() != 1) {
+            return null;
+        }
+
+        Class<?> declaringClass = annotatedConstructor.getDeclaringClass();
+
+        if (declaringClass.getDeclaredConstructors().length > 1) {
+            return null;
+        }
+
+        if (doesntHaveMatchingFieldAndParameter(annotatedConstructor, declaringClass)) {
+            return null;
+        }
+
+        return JsonCreator.Mode.PROPERTIES;
+    }
+
+    private boolean doesntHaveMatchingFieldAndParameter(AnnotatedConstructor annotatedConstructor,
+                                                        Class<?> declaringClass) {
+        String parameterName = annotatedConstructor.getAnnotated().getParameters()[0].getName();
+        return Stream.of(declaringClass.getDeclaredFields())
+                     .noneMatch(field -> doesFieldMatchParameter(field, parameterName));
+    }
+
+    private boolean doesFieldMatchParameter(Field field, String parameterName) {
+
+        JsonProperty annotation = field.getAnnotation(JsonProperty.class);
+
+        if (Objects.nonNull(annotation) && annotation.value().equals(parameterName)) {
+            return true;
+        }
+
+        return field.getName().equals(parameterName);
+    }
+}
diff --git a/...sion-module/src/test/java/com/infobip/jackson/CustomTypeFieldSimpleJsonHierarchyTest.java b/...sion-module/src/test/java/com/infobip/jackson/CustomTypeFieldSimpleJsonHierarchyTest.java
@@ -110,14 +110,12 @@ interface FooBar extends SimpleJsonHierarchy<FooBarType> {
         FooBarType getType();
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Foo implements FooBar {
         private final String foo;
         private final FooBarType type = FooBarType.FOO;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Bar implements FooBar {
         private final String bar;
@@ -132,4 +130,4 @@ enum FooBarType implements TypeProvider {
 
         private final Class<? extends FooBar> type;
     }
-}
+}
diff --git a/...sion-module/src/test/java/com/infobip/jackson/JsonTypedAbstractClassDeserializerTest.java b/...sion-module/src/test/java/com/infobip/jackson/JsonTypedAbstractClassDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.*;
 import org.junit.jupiter.api.Test;
@@ -48,14 +47,12 @@ public Class<?> resolve(Map<String, Object> json) {
         }
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Foo extends FooBar {
         private final String foo;
         private final FooBarType type = FooBarType.FOO;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Bar extends FooBar {
         private final String bar;
@@ -70,4 +67,4 @@ enum FooBarType {
 
         private final Class<? extends FooBar> type;
     }
-}
+}
diff --git a/...jackson-extension-module/src/test/java/com/infobip/jackson/JsonTypedDeserializerTest.java b/...jackson-extension-module/src/test/java/com/infobip/jackson/JsonTypedDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.*;
@@ -113,14 +112,12 @@ public Class<?> resolve(Map<String, Object> json) {
         }
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Foo implements FooBar {
         private final String foo;
         private final FooBarType type = FooBarType.FOO;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Bar implements FooBar {
         private final String bar;
@@ -135,4 +132,4 @@ enum FooBarType {
 
         private final Class<? extends FooBar> type;
     }
-}
+}
diff --git a/...ension-module/src/test/java/com/infobip/jackson/LowerCaseTypeSimpleJsonHierarchyTest.java b/...ension-module/src/test/java/com/infobip/jackson/LowerCaseTypeSimpleJsonHierarchyTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -108,14 +107,12 @@ interface FooBar extends SimpleJsonHierarchy<FooBarType> {
         FooBarType getType();
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Foo implements FooBar {
         private final String foo;
         private final FooBarType type = FooBarType.FOO;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Bar implements FooBar {
         private final String bar;
@@ -135,4 +132,4 @@ String getValue() {
             return toString().toLowerCase();
         }
     }
-}
+}
diff --git a/...ion-module/src/test/java/com/infobip/jackson/MultiHierarchyJsonTypedDeserializerTest.java b/...ion-module/src/test/java/com/infobip/jackson/MultiHierarchyJsonTypedDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.*;
@@ -123,7 +122,6 @@ public MammalJsonTypeResolver() {
         }
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Human implements Mammal {
         private final String name;
@@ -146,4 +144,4 @@ enum MammalType implements TypeProvider {
 
         private final Class<? extends Mammal> type;
     }
-}
+}
diff --git a/...est/java/com/infobip/jackson/MultiHierarchyWithOneTypeFieldJsonTypedDeserializerTest.java b/...est/java/com/infobip/jackson/MultiHierarchyWithOneTypeFieldJsonTypedDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.*;
@@ -106,7 +105,6 @@ interface Animal extends SimpleJsonHierarchy<AnimalType> {
     interface Mammal extends Animal {
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Human implements Mammal {
         private final String name;
@@ -124,4 +122,4 @@ enum AnimalType implements TypeProvider {
 
         private final Class<? extends Animal> type;
     }
-}
+}
diff --git a/...n-module/src/test/java/com/infobip/jackson/PresentPropertyCaseFormatDeserializerTest.java b/...n-module/src/test/java/com/infobip/jackson/PresentPropertyCaseFormatDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
@@ -117,14 +116,12 @@ public LowerUnderscorePresentPropertyJsonTypeResolver(Class<E> type) {
         }
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class RoadBike implements Bike {
 
         private final String roadBike;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class MountainBike implements Bike {
 

diff --git a/...n-extension-module/src/test/java/com/infobip/jackson/PresentPropertyDeserializerTest.java b/...n-extension-module/src/test/java/com/infobip/jackson/PresentPropertyDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.*;
@@ -103,14 +102,12 @@ interface Bike extends PresentPropertyJsonHierarchy<BikeType> {
 
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class RoadBike implements Bike {
 
         private final String roadBike;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Bmx implements Bike {
 

diff --git a/.../src/test/java/com/infobip/jackson/PresentPropertyResolverWithDefaultConstructorTest.java b/.../src/test/java/com/infobip/jackson/PresentPropertyResolverWithDefaultConstructorTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.base.CaseFormat;
 import lombok.*;
@@ -43,14 +42,12 @@ public BikeTypeResolver() {
         }
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class RoadBike implements Bike {
 
         private final String roadBike;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class MountainBike implements Bike {
 

diff --git a/...tension-module/src/test/java/com/infobip/jackson/SimpleJsonHierarchyDeserializerTest.java b/...tension-module/src/test/java/com/infobip/jackson/SimpleJsonHierarchyDeserializerTest.java
@@ -1,6 +1,5 @@
 package com.infobip.jackson;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.*;
@@ -105,14 +104,12 @@ void shouldDeserializeFooAsFooFromJson() throws JsonProcessingException {
     interface FooBar extends SimpleJsonHierarchy<FooBarType> {
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Foo implements FooBar {
         private final String foo;
         private final FooBarType type = FooBarType.FOO;
     }
 
-    @AllArgsConstructor(onConstructor_ = @JsonCreator)
     @Value
     static class Bar implements FooBar {
         private final String bar;
@@ -127,4 +124,4 @@ enum FooBarType implements TypeProvider {
 
         private final Class<? extends FooBar> type;
     }
-}
+}