From 5edf70a4503935ad1b9eb3e403acb28a45fd83b8 Mon Sep 17 00:00:00 2001 From: Nikita Date: Wed, 29 Mar 2017 12:44:32 +0300 Subject: [PATCH] code warnings removed --- .../redisson/liveobject/core/AccessorInterceptor.java | 4 ++-- .../liveobject/core/FieldAccessorInterceptor.java | 9 +++++---- .../redisson/liveobject/core/LiveObjectInterceptor.java | 8 ++++---- .../redisson/liveobject/core/RExpirableInterceptor.java | 4 ++-- .../org/redisson/liveobject/core/RMapInterceptor.java | 4 ++-- .../org/redisson/liveobject/core/RObjectInterceptor.java | 2 +- .../redisson/liveobject/core/RedissonObjectBuilder.java | 3 +-- .../java/org/redisson/liveobject/misc/ClassUtils.java | 6 +++--- .../org/redisson/liveobject/resolver/RIdResolver.java | 4 ++-- .../org/redisson/liveobject/resolver/UUIDGenerator.java | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java index 9a8847cbe..d690b0765 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java @@ -118,11 +118,11 @@ public class AccessorInterceptor { RObject rObject = objectBuilder.createObject(((RLiveObject) me).getLiveObjectId(), me.getClass().getSuperclass(), arg.getClass(), fieldName); if (arg != null) { if (rObject instanceof Collection) { - Collection c = (Collection) rObject; + Collection c = (Collection) rObject; c.clear(); c.addAll((Collection) arg); } else { - Map m = (Map) rObject; + Map m = (Map) rObject; m.clear(); m.putAll((Map) arg); } diff --git a/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java index b5219276d..cf9f500ac 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java @@ -15,15 +15,16 @@ */ package org.redisson.liveobject.core; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + +import org.redisson.api.RMap; +import org.redisson.liveobject.misc.ClassUtils; + import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.FieldValue; import net.bytebuddy.implementation.bind.annotation.Origin; import net.bytebuddy.implementation.bind.annotation.RuntimeType; import net.bytebuddy.implementation.bind.annotation.This; -import org.redisson.api.RMap; -import org.redisson.liveobject.misc.ClassUtils; /** * @@ -36,7 +37,7 @@ public class FieldAccessorInterceptor { @Origin Method method, @AllArguments Object[] args, @This Object me, - @FieldValue("liveObjectLiveMap") RMap map + @FieldValue("liveObjectLiveMap") RMap map ) throws Exception { if (args.length >= 1 && String.class.isAssignableFrom(args[0].getClass())) { String name = ((String) args[0]).substring(0, 1).toUpperCase() + ((String) args[0]).substring(1); diff --git a/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java index d1396d2d4..e0ae797e3 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java @@ -50,13 +50,13 @@ public class LiveObjectInterceptor { private final RedissonClient redisson; private final CodecProvider codecProvider; - private final Class originalClass; + private final Class originalClass; private final String idFieldName; - private final Class idFieldType; + private final Class idFieldType; private final NamingScheme namingScheme; private final Class codecClass; - public LiveObjectInterceptor(RedissonClient redisson, CodecProvider codecProvider, Class entityClass, String idFieldName) { + public LiveObjectInterceptor(RedissonClient redisson, CodecProvider codecProvider, Class entityClass, String idFieldName) { this.redisson = redisson; this.codecProvider = codecProvider; this.originalClass = entityClass; @@ -79,7 +79,7 @@ public class LiveObjectInterceptor { @FieldValue("liveObjectId") Object id, @FieldProxy("liveObjectId") Setter idSetter, @FieldProxy("liveObjectId") Getter idGetter, - @FieldValue("liveObjectLiveMap") RMap map, + @FieldValue("liveObjectLiveMap") RMap map, @FieldProxy("liveObjectLiveMap") Setter mapSetter, @FieldProxy("liveObjectLiveMap") Getter mapGetter ) throws Exception { diff --git a/redisson/src/main/java/org/redisson/liveobject/core/RExpirableInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/RExpirableInterceptor.java index 3a59a3412..d0bfd7f54 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/RExpirableInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/RExpirableInterceptor.java @@ -34,9 +34,9 @@ public class RExpirableInterceptor { public static Object intercept( @Origin Method method, @AllArguments Object[] args, - @FieldValue("liveObjectLiveMap") RMap map + @FieldValue("liveObjectLiveMap") RMap map ) throws Exception { - Class[] cls = new Class[args.length]; + Class[] cls = new Class[args.length]; for (int i = 0; i < args.length; i++) { cls[i] = args[i].getClass(); } diff --git a/redisson/src/main/java/org/redisson/liveobject/core/RMapInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/RMapInterceptor.java index ecfc2ed29..26c682605 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/RMapInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/RMapInterceptor.java @@ -33,9 +33,9 @@ public class RMapInterceptor { public static Object intercept( @Origin Method method, @AllArguments Object[] args, - @FieldValue("liveObjectLiveMap") RMap map + @FieldValue("liveObjectLiveMap") RMap map ) throws Exception { - Class[] cls = new Class[args.length]; + Class[] cls = new Class[args.length]; for (int i = 0; i < args.length; i++) { cls[i] = args[i].getClass(); } diff --git a/redisson/src/main/java/org/redisson/liveobject/core/RObjectInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/RObjectInterceptor.java index 41d2393ea..1f88dcbb0 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/RObjectInterceptor.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/RObjectInterceptor.java @@ -32,7 +32,7 @@ public class RObjectInterceptor { public static Object intercept( @Origin Method method, @AllArguments Object[] args, - @FieldValue("liveObjectLiveMap") RMap map + @FieldValue("liveObjectLiveMap") RMap map ) throws Exception { throw new UnsupportedOperationException("Please use RLiveObjectService instance for this type of functions"); } diff --git a/redisson/src/main/java/org/redisson/liveobject/core/RedissonObjectBuilder.java b/redisson/src/main/java/org/redisson/liveobject/core/RedissonObjectBuilder.java index 101414170..b53dc03b3 100644 --- a/redisson/src/main/java/org/redisson/liveobject/core/RedissonObjectBuilder.java +++ b/redisson/src/main/java/org/redisson/liveobject/core/RedissonObjectBuilder.java @@ -16,7 +16,6 @@ package org.redisson.liveobject.core; import java.lang.reflect.Field; -import java.util.Collection; import java.util.Deque; import java.util.LinkedHashMap; import java.util.List; @@ -123,7 +122,7 @@ public class RedissonObjectBuilder { return codecProvider.getCodec(anno, rEntity, rObjectClass, fieldName); } else { REntity anno = rEntity.getAnnotation(REntity.class); - return codecProvider.getCodec(anno, (Class) rEntity); + return codecProvider.getCodec(anno, (Class) rEntity); } } diff --git a/redisson/src/main/java/org/redisson/liveobject/misc/ClassUtils.java b/redisson/src/main/java/org/redisson/liveobject/misc/ClassUtils.java index c2b664731..e94d91ef0 100644 --- a/redisson/src/main/java/org/redisson/liveobject/misc/ClassUtils.java +++ b/redisson/src/main/java/org/redisson/liveobject/misc/ClassUtils.java @@ -105,7 +105,7 @@ public class ClassUtils { * * @return Method object */ - public static Method searchForMethod(Class type, String name, Class[] parms) { + public static Method searchForMethod(Class type, String name, Class[] parms) { try { return type.getMethod(name, parms); } catch (NoSuchMethodException e) {} @@ -116,7 +116,7 @@ public class ClassUtils { continue; } - Class[] types = methods[i].getParameterTypes(); + Class[] types = methods[i].getParameterTypes(); // Does it have the same number of arguments that we're looking for. if (types.length != parms.length) { continue; @@ -130,7 +130,7 @@ public class ClassUtils { return null; } - private static boolean areTypesCompatible(Class[] targets, Class[] sources) { + private static boolean areTypesCompatible(Class[] targets, Class[] sources) { if (targets.length != sources.length) { return false; } diff --git a/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java b/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java index 4b894dcc2..1b221ef49 100644 --- a/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java +++ b/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java @@ -24,7 +24,7 @@ import org.redisson.api.annotation.RId; * @param RId annotation to resolve * @param Value type */ -public interface RIdResolver extends Resolver{ +public interface RIdResolver extends Resolver, A, V>{ /** * RLiveObjectService instantiate the class and invokes this method to get @@ -35,6 +35,6 @@ public interface RIdResolver extends Resolver{ * @param redisson instance * @return resolved RId field value. */ - public V resolve(Class cls, A annotation, String idFieldName, RedissonClient redisson); + public V resolve(Class cls, A annotation, String idFieldName, RedissonClient redisson); } diff --git a/redisson/src/main/java/org/redisson/liveobject/resolver/UUIDGenerator.java b/redisson/src/main/java/org/redisson/liveobject/resolver/UUIDGenerator.java index a4f6cfe4b..81324610d 100644 --- a/redisson/src/main/java/org/redisson/liveobject/resolver/UUIDGenerator.java +++ b/redisson/src/main/java/org/redisson/liveobject/resolver/UUIDGenerator.java @@ -29,7 +29,7 @@ public class UUIDGenerator implements RIdResolver{ public static final UUIDGenerator INSTANCE = new UUIDGenerator(); @Override - public String resolve(Class value, RId id, String idFieldName, RedissonClient redisson) { + public String resolve(Class value, RId id, String idFieldName, RedissonClient redisson) { return UUID.randomUUID().toString(); }