From f7d7c586c0ce81160854a5b90972692bdf6cdb9f Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 27 Jun 2012 18:22:36 +0000 Subject: [PATCH] Make GenRecordTask only honor @Transient, like DepotMarshaller. We've chosen not to conflate Java transience with Depot non-persistence. It's a little wonky to have to choose a particular memory model behavior just to have a field not persisted in your record. --- src/main/java/com/samskivert/depot/impl/DepotMarshaller.java | 2 +- src/main/java/com/samskivert/depot/tools/GenRecordTask.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java index c6f715c..1b6e517 100644 --- a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java +++ b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java @@ -118,7 +118,7 @@ public class DepotMarshaller implements QueryMarshal } } - // the field must be public, non-static and non-transient + // the field must be public, non-static and non-@Transient if (!java.lang.reflect.Modifier.isPublic(mods) || java.lang.reflect.Modifier.isStatic(mods) || field.getAnnotation(Transient.class) != null) { diff --git a/src/main/java/com/samskivert/depot/tools/GenRecordTask.java b/src/main/java/com/samskivert/depot/tools/GenRecordTask.java index a5a1fca..aae9d55 100644 --- a/src/main/java/com/samskivert/depot/tools/GenRecordTask.java +++ b/src/main/java/com/samskivert/depot/tools/GenRecordTask.java @@ -343,13 +343,13 @@ public class GenRecordTask extends Task /** * Returns true if the supplied field is part of a persistent record (is a public, non-static, - * non-transient field). + * non-@Transient field). */ protected boolean isPersistentField (Field field) { int mods = field.getModifiers(); return Modifier.isPublic(mods) && !Modifier.isStatic(mods) && - !Modifier.isTransient(mods) && !hasAnnotation(field, Transient.class); + !hasAnnotation(field, Transient.class); } /**