added handling of PresentPropertyJsonHierarchy type in JsonTypeResolv…

…erFactory causing illegal argument exception
infobip · Mar 9, 2023 · 19e5dc8 · 19e5dc8
1 parent 3f69031
commit 19e5dc8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/...p-jackson-extension-module/src/main/java/com/infobip/jackson/JsonTypeResolverFactory.java b/...p-jackson-extension-module/src/main/java/com/infobip/jackson/JsonTypeResolverFactory.java
@@ -7,19 +7,17 @@
 import java.lang.reflect.Type;
 import java.util.*;
 
-import com.google.common.collect.ImmutableSet;
-
 public class JsonTypeResolverFactory {
 
-    private final Set<Class<?>> ignoredClasses = ImmutableSet.of(SimpleJsonHierarchy.class,
-                                                                 PresentPropertyJsonHierarchy.class);
+    private final Set<Class<?>> ignoredClasses = Set.of(SimpleJsonHierarchy.class,
+                                                        PresentPropertyJsonHierarchy.class);
 
     public Optional<JsonTypeResolver> create(Class<?> type) {
         if (Objects.isNull(type)) {
             return Optional.empty();
         }
 
-        if(ignoredClasses.contains(type)) {
+        if (ignoredClasses.contains(type)) {
             return Optional.empty();
         }
 
@@ -59,24 +57,24 @@ private <E extends Enum<E> & TypeProvider> SimpleJsonTypeResolver<E> createSimpl
     }
 
     private <E extends Enum<E> & TypeProvider> PresentPropertyJsonTypeResolver<E> createPresentPropertyJsonTypeResolver(
-            Class<?> type) {
+        Class<?> type) {
         Class<E> enumType = resolveFirstGenericTypeArgument(type, PresentPropertyJsonHierarchy.class);
         return new PresentPropertyJsonTypeResolver<>(enumType);
     }
 
     @SuppressWarnings("unchecked")
     private <E extends Enum<E> & TypeProvider> PresentPropertyJsonTypeResolver<E> createSubtypeOfPresentPropertyJsonTypeResolver(
-            Class<?> resolverType,
-            Class<?> targetType) throws
-            IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException {
+        Class<?> resolverType,
+        Class<?> targetType) throws
+        IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException {
 
         Class<E> enumType = resolveFirstGenericTypeArgument(targetType, PresentPropertyJsonHierarchy.class);
         for (Constructor<?> cctor : resolverType.getConstructors()) {
             if (cctor.getParameterCount() == 0) {
                 return (PresentPropertyJsonTypeResolver<E>) getConstructor(resolverType).newInstance();
             } else if (cctor.getParameterCount() == 1 && cctor.getParameterTypes()[0].equals(Class.class)) {
                 return (PresentPropertyJsonTypeResolver<E>) getConstructor(resolverType, Class.class).newInstance(
-                        enumType);
+                    enumType);
             }
         }
         throw new IllegalArgumentException("Failed to resolve default constructor for " + resolverType);
@@ -129,7 +127,7 @@ private <T> T resolveFirstGenericTypeArgument(Class<?> type, Class<?> interfaceT
         }
 
         throw new IllegalArgumentException(
-                "Failed to resolve type argument " + type + " " + interfaceType + " with index" + 0);
+            "Failed to resolve type argument " + type + " " + interfaceType + " with index" + 0);
     }
 
     private List<Type> getAllInterfaces(Class<?> type) {
@@ -150,6 +148,7 @@ private List<Type> getAllInterfaces(Class<?> type) {
 
     private boolean isSubtypeOf(Class<?> type, Class<?> parentType) {
         return type.getSuperclass() != null
-                && (type.getSuperclass().equals(parentType) || isSubtypeOf(type.getSuperclass(), parentType));
+               && (type.getSuperclass().equals(parentType) || isSubtypeOf(type.getSuperclass(), parentType));
     }
+
 }
diff --git a/...ckson-extension-module/src/test/java/com/infobip/jackson/JsonTypeResolverFactoryTest.java b/...ckson-extension-module/src/test/java/com/infobip/jackson/JsonTypeResolverFactoryTest.java
@@ -6,7 +6,7 @@
 
 class JsonTypeResolverFactoryTest {
 
-    private JsonTypeResolverFactory factory = new JsonTypeResolverFactory();
+    private final JsonTypeResolverFactory factory = new JsonTypeResolverFactory();
 
     @Test
     void shouldHandleSimpleJsonHierarchy() {
@@ -22,7 +22,7 @@ void shouldHandleSimpleJsonHierarchy() {
     void shouldHandlePresentPropertyJsonHierarchyHierarchy() {
 
         // when
-        Optional<JsonTypeResolver> actual = factory.create(PresentPropertyJsonHierarchy.class);
+        var actual = factory.create(PresentPropertyJsonHierarchy.class);
 
         // then
         then(actual).isEmpty();