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:36:55 UTC
incubator-johnzon git commit: more global exclude rules for fields
and methods
Repository: incubator-johnzon
Updated Branches:
refs/heads/master 8e253a052 -> bcf51d2e5
more global exclude rules for fields and methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/bcf51d2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/bcf51d2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/bcf51d2e
Branch: refs/heads/master
Commit: bcf51d2e5b1267dcf317816b7db759460cb3c715
Parents: 8e253a0
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Nov 11 20:36:49 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Nov 11 20:36:49 2014 +0100
----------------------------------------------------------------------
.../org/apache/johnzon/mapper/access/FieldAccessMode.java | 2 +-
.../org/apache/johnzon/mapper/access/MethodAccessMode.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/bcf51d2e/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 ad437d3..2df9bb6 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
@@ -55,7 +55,7 @@ public class FieldAccessMode implements AccessMode {
}
protected boolean isIgnored(final String key) {
- return "$jacocoData".equals(key);
+ return key.contains("$");
}
private Map<String, Field> fields(final Class<?> clazz) {
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/bcf51d2e/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 c605d73..cd8f37d 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
@@ -37,7 +37,7 @@ public class MethodAccessMode implements AccessMode {
for (final PropertyDescriptor descriptor : propertyDescriptors) {
final Method readMethod = descriptor.getReadMethod();
if (readMethod != null && readMethod.getDeclaringClass() != Object.class) {
- if (isIgnored(descriptor)) {
+ if (isIgnored(descriptor.getName())) {
continue;
}
readers.put(descriptor.getName(), new MethodReader(readMethod));
@@ -53,7 +53,7 @@ public class MethodAccessMode implements AccessMode {
for (final PropertyDescriptor descriptor : propertyDescriptors) {
final Method writeMethod = descriptor.getWriteMethod();
if (writeMethod != null && writeMethod.getDeclaringClass() != Object.class) {
- if (isIgnored(descriptor)) {
+ if (isIgnored(descriptor.getName())) {
continue;
}
writers.put(descriptor.getName(), new MethodWriter(writeMethod));
@@ -62,8 +62,8 @@ public class MethodAccessMode implements AccessMode {
return writers;
}
- protected boolean isIgnored(final PropertyDescriptor descriptor) {
- return descriptor.getName().equals("metaClass");
+ protected boolean isIgnored(final String name) {
+ return name.equals("metaClass") || name.contains("$");
}
private PropertyDescriptor[] getPropertyDescriptors(final Class<?> clazz) {