You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2014/11/11 20:06:09 UTC
incubator-johnzon git commit: ignore and allow to override easily
isIgnored in our access modes
Repository: incubator-johnzon
Updated Branches:
refs/heads/master bb96f71eb -> deaea89fb
ignore and allow to override easily isIgnored in our access modes
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/deaea89f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/deaea89f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/deaea89f
Branch: refs/heads/master
Commit: deaea89fb84bddbed38b17c088fedc6bb2a84b96
Parents: bb96f71
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Nov 11 20:05:55 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Nov 11 20:05:55 2014 +0100
----------------------------------------------------------------------
.../johnzon/mapper/access/FieldAccessMode.java | 16 ++++++++++++++--
.../johnzon/mapper/access/MethodAccessMode.java | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/deaea89f/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
index cf15685..7aecf3c 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java
@@ -31,7 +31,11 @@ public class FieldAccessMode implements AccessMode {
public Map<String, Reader> findReaders(final Class<?> clazz) {
final Map<String, Reader> readers = new HashMap<String, Reader>();
for (final Map.Entry<String, Field> f : fields(clazz).entrySet()) {
- readers.put(f.getKey(), new FieldReader(f.getValue()));
+ final String key = f.getKey();
+ if (isIgnored(key)) {
+ continue;
+ }
+ readers.put(key, new FieldReader(f.getValue()));
}
return readers;
}
@@ -40,11 +44,19 @@ public class FieldAccessMode implements AccessMode {
public Map<String, Writer> findWriters(final Class<?> clazz) {
final Map<String, Writer> writers = new HashMap<String, Writer>();
for (final Map.Entry<String, Field> f : fields(clazz).entrySet()) {
- writers.put(f.getKey(), new FieldWriter(f.getValue()));
+ final String key = f.getKey();
+ if (isIgnored(key)) {
+ continue;
+ }
+ writers.put(key, new FieldWriter(f.getValue()));
}
return writers;
}
+ protected boolean isIgnored(final String key) {
+ return "$jacocoData".equals(key);
+ }
+
private Map<String, Field> fields(final Class<?> clazz) {
final Map<String, Field> fields = new HashMap<String, Field>();
Class<?> current = clazz;
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/deaea89f/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
index 78231bc..c605d73 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/MethodAccessMode.java
@@ -62,7 +62,7 @@ public class MethodAccessMode implements AccessMode {
return writers;
}
- private boolean isIgnored(final PropertyDescriptor descriptor) {
+ protected boolean isIgnored(final PropertyDescriptor descriptor) {
return descriptor.getName().equals("metaClass");
}