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/07/17 21:12:48 UTC
git commit: better integration with groovy and our mapper
Repository: incubator-fleece
Updated Branches:
refs/heads/master 4b9ae6880 -> 817ee6820
better integration with groovy and our mapper
Project: http://git-wip-us.apache.org/repos/asf/incubator-fleece/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fleece/commit/817ee682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fleece/tree/817ee682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fleece/diff/817ee682
Branch: refs/heads/master
Commit: 817ee6820d9f201046e9d9e2e4537cc1f2a888ce
Parents: 4b9ae68
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Thu Jul 17 21:12:35 2014 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Thu Jul 17 21:12:35 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/fleece/mapper/reflection/Mappings.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/817ee682/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
----------------------------------------------------------------------
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java b/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
index 75b84ad..e8fc5b7 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
+++ b/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
@@ -212,6 +212,10 @@ public class Mappings {
final FleeceIgnore writeIgnore = writeMethod != null ? writeMethod.getAnnotation(FleeceIgnore.class) : null;
if (writeMethod != null && writeMethod.getDeclaringClass() != Object.class
&& (writeIgnore == null || writeIgnore.minVersion() >= 0)) {
+ if (descriptor.getName().equals("metaClass") &&
+ writeMethod.getDeclaringClass().getName().equals("groovy.lang.GroovyObject")) {
+ continue;
+ }
final Type param = writeMethod.getGenericParameterTypes()[0];
setters.put(descriptor.getName(), new Setter(
writeMethod,
@@ -225,6 +229,11 @@ public class Mappings {
final FleeceIgnore readIgnore = readMethod != null ? readMethod.getAnnotation(FleeceIgnore.class) : null;
if (readMethod != null && readMethod.getDeclaringClass() != Object.class
&& (readIgnore == null || readIgnore.minVersion() >= 0)) {
+ if (descriptor.getName().equals("metaClass") &&
+ readMethod.getDeclaringClass().getName().equals("groovy.lang.GroovyObject")) {
+ continue;
+ }
+
final Class<?> returnType = readMethod.getReturnType();
getters.put(descriptor.getName(), new Getter(
readMethod,