Bugfix/retain generics (#10)

* Reworked how generics work - huge improvement

* Change version number

Author: jparams

build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'maven'
 apply from: 'publish.gradle'
 
 group = 'com.jparams'
-version = '2.0.2'
+version = '2.0.3'
 
 sourceCompatibility = 1.8
 

src/main/java/com/jparams/object/builder/ObjectBuilder.java

@@ -33,7 +33,7 @@ private ObjectBuilder(final ObjectFactory objectFactory)
      */
     public <T> Build<T> buildInstanceOf(final Class<T> clazz)
     {
-        final Type<?> type = TypeResolver.resolve(ifNotNull(clazz));
+        final Type<?> type = TypeResolver.resolveType(ifNotNull(clazz));
         final Path path = new Path("$", type, null);
         return objectFactory.create(path);
     }

src/main/java/com/jparams/object/builder/provider/ArrayProvider.java

@@ -18,7 +18,7 @@ public boolean supports(final Type<?> type)
     public Object[] provide(final Context context)
     {
         final Class<?> componentType = context.getPath().getType().getJavaType().getComponentType();
-        final Type<?> type = TypeResolver.resolve(componentType);
+        final Type<?> type = TypeResolver.resolveType(context.getPath(), componentType);
         final Object[] array = (Object[]) Array.newInstance(componentType, 1);
         array[0] = context.createChild("[0]", type);
         return array;

src/main/java/com/jparams/object/builder/provider/ConcurrentMapProvider.java

@@ -25,8 +25,8 @@ public boolean supports(final Type<?> type)
             return map;
         }
 
-        final Type<?> keyType = context.getPath().getType().getGenerics().get(0);
-        final Type<?> valueType = context.getPath().getType().getGenerics().get(1);
+        final Type<?> keyType = context.getPath().getType().getGenerics().get(0).getType();
+        final Type<?> valueType = context.getPath().getType().getGenerics().get(1).getType();
         final Object key = context.createChild("[0.key]", keyType);
         final Object value = context.createChild("[0.value]", valueType);
         map.put(key, value);

src/main/java/com/jparams/object/builder/provider/DequeProvider.java

@@ -25,7 +25,7 @@ public Deque<?> provide(final Context context)
             return deque;
         }
 
-        final Type<?> type = context.getPath().getType().getGenerics().get(0);
+        final Type<?> type = context.getPath().getType().getGenerics().get(0).getType();
         deque.add(context.createChild("[0]", type));
         return deque;
     }

src/main/java/com/jparams/object/builder/provider/InterfaceProvider.java

@@ -46,7 +46,7 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
             }
 
             final String methodName = String.format("%s(%s)", method.getName(), args == null || args.length == 0 ? "" : Arrays.toString(args));
-            final Type<?> type = TypeResolver.resolve(method);
+            final Type<?> type = TypeResolver.resolveReturnType(context.getPath(), method);
 
             if (type == null)
             {

src/main/java/com/jparams/object/builder/provider/ListProvider.java

@@ -23,7 +23,7 @@ public List<?> provide(final Context context)
             return Collections.emptyList();
         }
 
-        final Type<?> type = context.getPath().getType().getGenerics().get(0);
+        final Type<?> type = context.getPath().getType().getGenerics().get(0).getType();
         final Object child = context.createChild("[0]", type);
         return Collections.singletonList(child);
     }

src/main/java/com/jparams/object/builder/provider/MapProvider.java

@@ -23,8 +23,8 @@ public boolean supports(final Type<?> type)
             return Collections.emptyMap();
         }
 
-        final Type<?> keyType = context.getPath().getType().getGenerics().get(0);
-        final Type<?> valueType = context.getPath().getType().getGenerics().get(1);
+        final Type<?> keyType = context.getPath().getType().getGenerics().get(0).getType();
+        final Type<?> valueType = context.getPath().getType().getGenerics().get(1).getType();
         final Object key = context.createChild("[0.key]", keyType);
         final Object value = context.createChild("[0.value]", valueType);
         return Collections.singletonMap(key, value);

src/main/java/com/jparams/object/builder/provider/ObjectProvider.java

@@ -10,6 +10,7 @@
 
 import com.jparams.object.builder.BuildStrategy;
 import com.jparams.object.builder.Context;
+import com.jparams.object.builder.path.Path;
 import com.jparams.object.builder.type.Type;
 import com.jparams.object.builder.type.TypeMap;
 import com.jparams.object.builder.type.TypeResolver;
@@ -85,7 +86,7 @@ private Object createInstanceWithConstructor(final Context context, final Constr
         for (int i = 0; i < constructor.getParameters().length; i++)
         {
             final Parameter parameter = constructor.getParameters()[i];
-            final Type<?> type = TypeResolver.resolve(parameter);
+            final Type<?> type = TypeResolver.resolveParameterType(context.getPath(), parameter);
             arguments[i] = context.createChild(name + "[" + i + "]", type);
         }
 
@@ -131,19 +132,40 @@ private Object createInstanceWithFieldInjection(final Context context)
 
     private void injectFields(final Object object, final Context context)
     {
-        for (final Field field : ObjectUtils.getFields(object.getClass()))
+        Path path = context.getPath();
+
+        while (true)
         {
-            try
+            final Class<?> clazz = path.getType().getJavaType();
+
+            for (final Field field : clazz.getDeclaredFields())
             {
-                final Type<?> type = TypeResolver.resolve(field);
-                final Object instance = context.createChild(field.getName(), type);
-                field.setAccessible(true);
-                field.set(object, instance);
+                if (Modifier.isStatic(field.getModifiers()))
+                {
+                    continue;
+                }
+
+                try
+                {
+                    final Type<?> type = TypeResolver.resolveFieldType(path, field);
+                    final Object instance = context.createChild(field.getName(), type);
+                    field.setAccessible(true);
+                    field.set(object, instance);
+                }
+                catch (final Exception e)
+                {
+                    context.logError("Failed to inject field [" + field.getName() + "]", e);
+                }
             }
-            catch (final Exception e)
+
+            final Type<?> superClass = TypeResolver.resolveType(path, clazz.getGenericSuperclass());
+
+            if (superClass == null)
             {
-                context.logError("Failed to inject field [" + field.getName() + "]", e);
+                return;
             }
+
+            path = new Path("$super", superClass, path);
         }
     }
 }

src/main/java/com/jparams/object/builder/provider/QueueProvider.java

@@ -25,7 +25,7 @@ public Queue<?> provide(final Context context)
             return queue;
         }
 
-        final Type<?> type = context.getPath().getType().getGenerics().get(0);
+        final Type<?> type = context.getPath().getType().getGenerics().get(0).getType();
         queue.add(context.createChild("[0]", type));
         return queue;
     }