From 92e5068fb4e1085dfb20120d803d05c691e74fa9 Mon Sep 17 00:00:00 2001 From: Nikita Date: Wed, 22 Feb 2017 20:36:20 +0300 Subject: [PATCH] dependencies updated --- redisson/pom.xml | 18 +++++++++--------- .../redisson/RedissonLiveObjectService.java | 16 +++++++++++----- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/redisson/pom.xml b/redisson/pom.xml index 32222c03e..884652062 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -151,7 +151,7 @@ org.msgpack jackson-dataformat-msgpack - 0.8.7 + 0.8.11 provided @@ -181,45 +181,45 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.7.6 + 2.8.7 com.fasterxml.jackson.core jackson-core - 2.7.6 + 2.8.7 com.fasterxml.jackson.core jackson-databind - 2.7.6 + 2.8.7 com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.7.6 + 2.8.7 provided com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.7.6 + 2.8.7 provided com.fasterxml.jackson.dataformat jackson-dataformat-avro - 2.7.6 + 2.8.7 provided net.openhft zero-allocation-hashing - 0.5 + 0.7 net.bytebuddy byte-buddy - 1.4.26 + 1.6.8 org.jodd diff --git a/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java b/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java index 92a83e3d0..6a9c69c5d 100644 --- a/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java +++ b/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java @@ -629,12 +629,18 @@ public class RedissonLiveObjectService implements RLiveObjectService { .and(ElementMatchers.isGetter().or(ElementMatchers.isSetter()) .or(ElementMatchers.named("isPhantom")) .or(ElementMatchers.named("delete")))) - .intercept(MethodDelegation.to( - new LiveObjectInterceptor(redisson, codecProvider, entityClass, - getRIdFieldName(entityClass))) - .appendParameterBinder(FieldProxy.Binder + .intercept(MethodDelegation.withDefaultConfiguration() + .withBinders(FieldProxy.Binder .install(LiveObjectInterceptor.Getter.class, - LiveObjectInterceptor.Setter.class))) + LiveObjectInterceptor.Setter.class)) + .to(new LiveObjectInterceptor(redisson, codecProvider, entityClass, + getRIdFieldName(entityClass)))) +// .intercept(MethodDelegation.to( +// new LiveObjectInterceptor(redisson, codecProvider, entityClass, +// getRIdFieldName(entityClass))) +// .appendParameterBinder(FieldProxy.Binder +// .install(LiveObjectInterceptor.Getter.class, +// LiveObjectInterceptor.Setter.class))) .implement(RLiveObject.class) .method(ElementMatchers.isAnnotatedWith(RFieldAccessor.class) .and(ElementMatchers.named("get")