Merge remote-tracking branch 'origin/dev' into dev

JavaWebStack · Nov 9, 2023 · 59aac8e · 59aac8e
2 parents b827750 + e3de5aa
commit 59aac8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/org/javawebstack/abstractdata/mapper/DefaultMappers.java b/src/main/java/org/javawebstack/abstractdata/mapper/DefaultMappers.java
@@ -263,7 +263,7 @@ public AbstractElement toAbstract(MapperContext context, Object value) throws Ma
 
         public Object fromAbstract(MapperContext context, AbstractElement element, Class<?> type) throws MapperException {
             try {
-                DateFormat df = context.getAnnotation(DateFormat.class);
+                DateFormat df = context.getField().getAnnotation(DateFormat.class);
                 Date date;
                 if (df != null && df.epoch()) {
                     long time = element.number(context.getMapper().isStrict()).longValue();

diff --git a/src/main/java/org/javawebstack/abstractdata/mapper/annotation/DateFormat.java b/src/main/java/org/javawebstack/abstractdata/mapper/annotation/DateFormat.java
@@ -1,5 +1,12 @@
 package org.javawebstack.abstractdata.mapper.annotation;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
 public @interface DateFormat {
 
     String value() default "";