Fixed NPE when there is no field given in the mapper context

Author: JanHolger

src/main/java/org/javawebstack/abstractdata/mapper/DefaultMappers.java

@@ -64,20 +64,20 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
                 }
                 if (type.equals(char.class) || type.equals(Character.class)) {
                     if (type.isPrimitive() && element.isNull())
-                        throw new MapperWrongTypeException(context.getField().getName(), "number", "null");
+                        throw new MapperWrongTypeException(context.getFieldName(), "number", "null");
                     String s = element.string(context.getMapper().isStrict());
                     if (s.length() != 1)
-                        throw new MapperException("Expected string of length 1 for field " + context.getField().getName() + " but received " + s.length());
+                        throw new MapperException("Expected string of length 1 for field " + context.getFieldName() + " but received " + s.length());
                     return s.charAt(0);
                 }
                 if (type.equals(Boolean.class) || type.equals(boolean.class)) {
                     if (type.isPrimitive() && element.isNull())
-                        throw new MapperWrongTypeException(context.getField().getName(), "number", "null");
+                        throw new MapperWrongTypeException(context.getFieldName(), "number", "null");
                     return element.bool(context.getMapper().isStrict());
                 }
                 if (Number.class.isAssignableFrom(type) || type.isPrimitive()) {
                     if (type.isPrimitive() && element.isNull())
-                        throw new MapperWrongTypeException(context.getField().getName(), "number", "null");
+                        throw new MapperWrongTypeException(context.getFieldName(), "number", "null");
                     if (type.equals(int.class) || type.equals(Integer.class))
                         return element.number(context.getMapper().isStrict()).intValue();
                     if (type.equals(long.class) || type.equals(Long.class))
@@ -95,9 +95,9 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
                     return element.number(context.getMapper().isStrict());
                 }
             } catch (AbstractCoercingException ex) {
-                throw new MapperWrongTypeException(context.getField().getName(), "string", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getField() != null ? context.getFieldName() : "", "string", Helpers.typeName(element));
             }
-            throw new MapperWrongTypeException(context.getField().getName(), "primitive", Helpers.typeName(element));
+            throw new MapperWrongTypeException(context.getFieldName(), "primitive", Helpers.typeName(element));
         }
 
         public Class<?>[] getSupportedTypes() {
@@ -157,7 +157,7 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
             } catch (InstantiationException | IllegalAccessException e) {
                 throw new RuntimeException(e);
             } catch (AbstractCoercingException ex) {
-                throw new MapperWrongTypeException(context.getField().getName(), "array", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "array", Helpers.typeName(element));
             }
         }
 
@@ -216,7 +216,7 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
             } catch (InstantiationException | IllegalAccessException e) {
                 throw new RuntimeException(e);
             } catch (AbstractCoercingException ex) {
-                throw new MapperWrongTypeException(context.getField().getName(), "object", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "object", Helpers.typeName(element));
             }
         }
 
@@ -284,7 +284,7 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
                     return new Timestamp(date.getTime());
                 throw new MapperException("Unsupported date type '" + type.getName() + "'");
             } catch (ParseException | NumberFormatException | AbstractCoercingException ex) {
-                throw new MapperException("Failed to parse date '" + element.string() + "'" + (context.getField() != null ? (" for field '" + context.getField().getName() + "'") : ""));
+                throw new MapperException("Failed to parse date '" + element.string() + "'" + (context.getField() != null ? (" for field '" + context.getFieldName() + "'") : ""));
             }
         }
 
@@ -311,13 +311,13 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
             if (type.equals(AbstractElement.class))
                 return element;
             if (type.equals(AbstractNull.class) && !(element instanceof AbstractNull))
-                throw new MapperWrongTypeException(context.getField().getName(), "null", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "null", Helpers.typeName(element));
             if (type.equals(AbstractPrimitive.class) && !(element instanceof AbstractPrimitive))
-                throw new MapperWrongTypeException(context.getField().getName(), "primitive", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "primitive", Helpers.typeName(element));
             if (type.equals(AbstractObject.class) && !(element instanceof AbstractObject))
-                throw new MapperWrongTypeException(context.getField().getName(), "object", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "object", Helpers.typeName(element));
             if (type.equals(AbstractArray.class) && !(element instanceof AbstractArray))
-                throw new MapperWrongTypeException(context.getField().getName(), "array", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "array", Helpers.typeName(element));
             return element;
         }
 
@@ -368,7 +368,7 @@ public AbstractElement toAbstract(MapperContext context, Object value) throws Ma
         public Object fromAbstract(MapperContext context, AbstractElement element, Class type) throws MapperException {
             if (type.isEnum()) {
                 if (!element.isString())
-                    throw new MapperWrongTypeException(context.getField().getName(), "string", Helpers.typeName(element));
+                    throw new MapperWrongTypeException(context.getFieldName(), "string", Helpers.typeName(element));
                 try {
                     return Enum.valueOf(type, element.string());
                 } catch (IllegalArgumentException ex) {
@@ -378,7 +378,7 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
             if (type.equals(UUID.class))
                 return UUID.fromString(element.string());
             if (!element.isObject())
-                throw new MapperWrongTypeException(context.getField().getName(), "object", Helpers.typeName(element));
+                throw new MapperWrongTypeException(context.getFieldName(), "object", Helpers.typeName(element));
             MapperTypeSpec spec = MapperTypeSpec.get(type);
             if (spec == null)
                 throw new MapperException("Unmappable type '" + type.getName() + "'");

src/main/java/org/javawebstack/abstractdata/mapper/MapperContext.java

@@ -34,6 +34,10 @@ public Field getField() {
         return field;
     }
 
+    public String getFieldName() {
+        return field != null ? field.getName() : null;
+    }
+
     public boolean isNested() {
         return field != null;
     }