github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
pull/1888/head
Nikita Koksharov 6 years ago
parent 1907e60af9
commit 2aca77d988
3 changed files with 156 additions and 199 deletions
Show Stats Download Patch File Download Diff File

129
redisson/src/main/java/org/redisson/misc/ProxyBuilder.java
Unescape Escape View File

@ -0,0 +1,129 @@
/**
* Copyright (c) 2013-2019 Nikita Koksharov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.redisson.misc;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
*
* @author Nikita Koksharov
*
*/
//TODO refactor to common object and MethodHandles
//MethodHandle mh = MethodHandles.lookup().findVirtual(implementation.getClass(), method.getName(),
// MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
public class ProxyBuilder {
public interface Callback {
Object execute(Method mm, Object instance, Object[] args);
}
private static class CacheKey {
Method method;
Class<?> instanceClass;
public CacheKey(Method method, Class<?> instanceClass) {
super();
this.method = method;
this.instanceClass = instanceClass;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((instanceClass == null) ? 0 : instanceClass.hashCode());
result = prime * result + ((method == null) ? 0 : method.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
CacheKey other = (CacheKey) obj;
if (instanceClass == null) {
if (other.instanceClass != null)
return false;
} else if (!instanceClass.equals(other.instanceClass))
return false;
if (method == null) {
if (other.method != null)
return false;
} else if (!method.equals(other.method))
return false;
return true;
}
}
private static final ConcurrentMap<CacheKey, Method> methodsMapping = new ConcurrentHashMap<CacheKey, Method>();
public static <T> T create(final Callback commandExecutor, final Object instance, final Object implementation, final Class<T> clazz) {
InvocationHandler handler = new InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method, final Object[] args) throws Throwable {
CacheKey key = new CacheKey(method, instance.getClass());
Method instanceMethod = methodsMapping.get(key);
if (instanceMethod == null) {
if (implementation != null) {
try {
instanceMethod = implementation.getClass().getMethod(method.getName(), method.getParameterTypes());
} catch (NoSuchMethodException e) {
try {
instanceMethod = instance.getClass().getMethod(method.getName() + "Async", method.getParameterTypes());
} catch (Exception e2) {
instanceMethod = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
}
}
} else {
try {
instanceMethod = instance.getClass().getMethod(method.getName() + "Async", method.getParameterTypes());
} catch (NoSuchMethodException e) {
instanceMethod = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
}
}
methodsMapping.put(key, instanceMethod);
}
final Method mm = instanceMethod;
if (instanceMethod.getName().endsWith("Async")) {
return commandExecutor.execute(mm, instance, args);
}
if (implementation != null
&& instanceMethod.getDeclaringClass().isAssignableFrom(implementation.getClass())) {
return instanceMethod.invoke(implementation, args);
}
return instanceMethod.invoke(instance, args);
}
};
return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] { clazz }, handler);
}
}

99
redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java
Unescape Escape View File

@ -15,13 +15,11 @@
*/
package org.redisson.reactive;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.redisson.api.RFuture;
import org.redisson.misc.ProxyBuilder;
import org.redisson.misc.ProxyBuilder.Callback;
import reactor.fn.Supplier;
@ -30,93 +28,17 @@ import reactor.fn.Supplier;
* @author Nikita Koksharov
*
*/
//TODO refactor to common object and MethodHandles
//MethodHandle mh = MethodHandles.lookup().findVirtual(implementation.getClass(), method.getName(),
// MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
public class ReactiveProxyBuilder {
private static class CacheKey {
Method method;
Class<?> instanceClass;
public CacheKey(Method method, Class<?> instanceClass) {
super();
this.method = method;
this.instanceClass = instanceClass;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((instanceClass == null) ? 0 : instanceClass.hashCode());
result = prime * result + ((method == null) ? 0 : method.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
CacheKey other = (CacheKey) obj;
if (instanceClass == null) {
if (other.instanceClass != null)
return false;
} else if (!instanceClass.equals(other.instanceClass))
return false;
if (method == null) {
if (other.method != null)
return false;
} else if (!method.equals(other.method))
return false;
return true;
}
}
private static final ConcurrentMap<CacheKey, Method> methodsMapping = new ConcurrentHashMap<CacheKey, Method>();
public static <T> T create(CommandReactiveExecutor commandExecutor, Object instance, Class<T> clazz) {
return create(commandExecutor, instance, null, clazz);
}
public static <T> T create(final CommandReactiveExecutor commandExecutor, final Object instance, final Object implementation, final Class<T> clazz) {
InvocationHandler handler = new InvocationHandler() {
public static <T> T create(final CommandReactiveExecutor commandExecutor, Object instance, Object implementation, Class<T> clazz) {
return ProxyBuilder.create(new Callback() {
@Override
public Object invoke(Object proxy, Method method, final Object[] args) throws Throwable {
CacheKey key = new CacheKey(method, instance.getClass());
Method instanceMethod = methodsMapping.get(key);
if (instanceMethod == null) {
if (implementation != null) {
try {
instanceMethod = implementation.getClass().getMethod(method.getName(), method.getParameterTypes());
} catch (NoSuchMethodException e) {
try {
instanceMethod = instance.getClass().getMethod(method.getName() + "Async", method.getParameterTypes());
} catch (Exception e2) {
instanceMethod = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
}
}
} else {
try {
instanceMethod = instance.getClass().getMethod(method.getName() + "Async", method.getParameterTypes());
} catch (NoSuchMethodException e) {
instanceMethod = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
}
}
methodsMapping.put(key, instanceMethod);
}
final Method mm = instanceMethod;
if (instanceMethod.getName().endsWith("Async")) {
public Object execute(final Method mm, final Object instance, final Object[] args) {
return commandExecutor.reactive(new Supplier<RFuture<Object>>() {
@SuppressWarnings("unchecked")
@Override
public RFuture<Object> get() {
try {
@ -127,16 +49,7 @@ public class ReactiveProxyBuilder {
}
});
}
if (implementation != null
&& instanceMethod.getDeclaringClass() == implementation.getClass()) {
return instanceMethod.invoke(implementation, args);
}
return instanceMethod.invoke(instance, args);
}
};
return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] { clazz }, handler);
}, instance, implementation, clazz);
}
}

97
redisson/src/main/java/org/redisson/rx/RxProxyBuilder.java
Unescape Escape View File

@ -15,104 +15,28 @@
*/
package org.redisson.rx;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.redisson.api.RFuture;
import org.redisson.misc.ProxyBuilder;
import org.redisson.misc.ProxyBuilder.Callback;
/**
*
* @author Nikita Koksharov
*
*/
//TODO refactor to common object and MethodHandles
//MethodHandle mh = MethodHandles.lookup().findVirtual(implementation.getClass(), method.getName(),
// MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
public class RxProxyBuilder {
private static class CacheKey {
Method method;
Class<?> instanceClass;
public CacheKey(Method method, Class<?> instanceClass) {
super();
this.method = method;
this.instanceClass = instanceClass;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((instanceClass == null) ? 0 : instanceClass.hashCode());
result = prime * result + ((method == null) ? 0 : method.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
CacheKey other = (CacheKey) obj;
if (instanceClass == null) {
if (other.instanceClass != null)
return false;
} else if (!instanceClass.equals(other.instanceClass))
return false;
if (method == null) {
if (other.method != null)
return false;
} else if (!method.equals(other.method))
return false;
return true;
}
}
private static final ConcurrentMap<CacheKey, Method> methodsMapping = new ConcurrentHashMap<CacheKey, Method>();
public static <T> T create(CommandRxExecutor commandExecutor, Object instance, Class<T> clazz) {
return create(commandExecutor, instance, null, clazz);
}
public static <T> T create(final CommandRxExecutor commandExecutor, final Object instance, final Object implementation, final Class<T> clazz) {
InvocationHandler handler = new InvocationHandler() {
public static <T> T create(final CommandRxExecutor commandExecutor, Object instance, Object implementation, Class<T> clazz) {
return ProxyBuilder.create(new Callback() {
@Override
public Object invoke(Object proxy, Method method, final Object[] args) throws Throwable {
CacheKey key = new CacheKey(method, instance.getClass());
Method instanceMethod = methodsMapping.get(key);
if (instanceMethod == null) {
if (implementation != null) {
try {
instanceMethod = implementation.getClass().getMethod(method.getName(), method.getParameterTypes());
} catch (NoSuchMethodException e) {
try {
instanceMethod = instance.getClass().getMethod(method.getName() + "Async", method.getParameterTypes());
} catch (Exception e2) {
instanceMethod = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
}
}
} else {
try {
instanceMethod = instance.getClass().getMethod(method.getName() + "Async", method.getParameterTypes());
} catch (NoSuchMethodException e) {
instanceMethod = instance.getClass().getMethod(method.getName(), method.getParameterTypes());
}
}
methodsMapping.put(key, instanceMethod);
}
final Method mm = instanceMethod;
if (instanceMethod.getName().endsWith("Async")) {
public Object execute(final Method mm, final Object instance, final Object[] args) {
return commandExecutor.flowable(new Callable<RFuture<Object>>() {
@SuppressWarnings("unchecked")
@Override
@ -125,16 +49,7 @@ public class RxProxyBuilder {
}
});
}
if (implementation != null
&& instanceMethod.getDeclaringClass().isAssignableFrom(implementation.getClass())) {
return instanceMethod.invoke(implementation, args);
}
return instanceMethod.invoke(instance, args);
}
};
return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] { clazz }, handler);
}, instance, implementation, clazz);
}
}

Write Preview
Loading…
Cancel
Save