[Refactor] Move full property fetching to AuditProvider.
This should come in handy when implementing @CreatedBy, as it follows the
same logic as @Modified(On|By).
Signed-off-by: Juri Berlanda <juriberlanda@hotmail.com>
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditProvider.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditProvider.java
index b549c9b..776a505 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditProvider.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditProvider.java
@@ -18,9 +18,15 @@
*/
package org.apache.deltaspike.data.impl.audit;
+import java.lang.annotation.Annotation;
+import java.util.LinkedList;
+import java.util.List;
import java.util.logging.Logger;
import org.apache.deltaspike.data.impl.property.Property;
+import org.apache.deltaspike.data.impl.property.query.AnnotatedPropertyCriteria;
+import org.apache.deltaspike.data.impl.property.query.PropertyQueries;
+import org.apache.deltaspike.data.impl.property.query.PropertyQuery;
abstract class AuditProvider implements PrePersistAuditListener, PreUpdateAuditListener
{
@@ -32,4 +38,22 @@
return entity.getClass().getSimpleName() + "." + property.getName();
}
+ List<Property<Object>> getProperties(
+ Object entity,
+ Class<? extends Annotation> createdAnnotation,
+ Class<? extends Annotation> modifiedAnnotation,
+ boolean create)
+ {
+ List<Property<Object>> properties = new LinkedList<>();
+ PropertyQuery<Object> query = PropertyQueries.createQuery(entity.getClass())
+ .addCriteria(new AnnotatedPropertyCriteria(modifiedAnnotation));
+ properties.addAll(query.getWritableResultList());
+ if (create)
+ {
+ query = PropertyQueries.<Object> createQuery(entity.getClass())
+ .addCriteria(new AnnotatedPropertyCriteria(createdAnnotation));
+ properties.addAll(query.getWritableResultList());
+ }
+ return properties;
+ }
}
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/TimestampsProvider.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/TimestampsProvider.java
index aeb5104..46e9dda 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/TimestampsProvider.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/TimestampsProvider.java
@@ -20,16 +20,11 @@
import java.util.Calendar;
import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
import java.util.logging.Level;
import org.apache.deltaspike.data.api.audit.CreatedOn;
import org.apache.deltaspike.data.api.audit.ModifiedOn;
import org.apache.deltaspike.data.impl.property.Property;
-import org.apache.deltaspike.data.impl.property.query.AnnotatedPropertyCriteria;
-import org.apache.deltaspike.data.impl.property.query.PropertyQueries;
-import org.apache.deltaspike.data.impl.property.query.PropertyQuery;
/**
* Set timestamps on marked properties.
@@ -52,17 +47,7 @@
private void updateTimestamps(Object entity, boolean create)
{
long systime = System.currentTimeMillis();
- List<Property<Object>> properties = new LinkedList<Property<Object>>();
- PropertyQuery<Object> query = PropertyQueries.<Object> createQuery(entity.getClass())
- .addCriteria(new AnnotatedPropertyCriteria(ModifiedOn.class));
- properties.addAll(query.getWritableResultList());
- if (create)
- {
- query = PropertyQueries.<Object> createQuery(entity.getClass())
- .addCriteria(new AnnotatedPropertyCriteria(CreatedOn.class));
- properties.addAll(query.getWritableResultList());
- }
- for (Property<Object> property : properties)
+ for (Property<Object> property : getProperties(entity, CreatedOn.class, ModifiedOn.class, create))
{
setProperty(entity, property, systime, create);
}
