1.2.2

- CHANGE: Removed explicit `ParameterNameDiscoverer` from `SpelKeyGenerator` which now uses the one provided by the `CachedExpressionEvaluator`
- CHANGE: Used `AopUtils` once and passed the evaluated method to `SpelKeyGenerator` so it doesn't have to evaluate the same thing as `LockMethodInterceptor`

Author: alturkovic

README.adoc

@@ -124,6 +124,10 @@ public class LockConfiguration {
 
 Started tracking the changes since 1.2.0 so no changelogs available for earlier versions.
 
+==== 1.2.2
+- CHANGE: Removed explicit `ParameterNameDiscoverer` from `SpelKeyGenerator` which now uses the one provided by the `CachedExpressionEvaluator`
+- CHANGE: Used `AopUtils` once and passed the evaluated method to `SpelKeyGenerator` so it doesn't have to evaluate the same thing as `LockMethodInterceptor`
+
 ==== 1.2.1
 - FEATURE: Lock refreshing has been added. Check the 'Lock refresh' chapter for more details
 - BUGFIX: `@RedisMultiLocked` was using `#executionPath` as prefix instead of an expression
@@ -162,6 +166,9 @@ Started tracking the changes since 1.2.0 so no changelogs available for earlier
 
 |1.2.1
 |2.1.0.RELEASE
+
+|1.2.2
+|2.1.0.RELEASE
 |===
 
 === Maven

distributed-lock-api/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.alturkovic</groupId>
     <artifactId>distributed-lock</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
 
   <artifactId>distributed-lock-api</artifactId>

distributed-lock-core/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.alturkovic</groupId>
     <artifactId>distributed-lock</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
 
   <artifactId>distributed-lock-core</artifactId>

distributed-lock-core/src/main/java/com/github/alturkovic/lock/advice/LockMethodInterceptor.java

@@ -39,7 +39,6 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.core.BridgeMethodResolver;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.retry.RetryPolicy;
 import org.springframework.retry.backoff.FixedBackOffPolicy;
@@ -48,7 +47,6 @@
 import org.springframework.retry.policy.TimeoutRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.scheduling.TaskScheduler;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 @Slf4j
@@ -61,8 +59,7 @@ public class LockMethodInterceptor implements MethodInterceptor {
 
   @Override
   public Object invoke(final MethodInvocation invocation) throws Throwable {
-    // not really sure if all of these util calls are necessary, but they should all return sensible values in case they are not needed
-    final Method method = BridgeMethodResolver.findBridgedMethod(ClassUtils.getMostSpecificMethod(invocation.getMethod(), AopUtils.getTargetClass(invocation.getThis())));
+    final Method method = AopUtils.getMostSpecificMethod(invocation.getMethod(), invocation.getThis().getClass());
     final Locked locked = AnnotatedElementUtils.findMergedAnnotation(method, Locked.class);
 
     final Lock lock = lockTypeResolver.get(locked.type());
@@ -77,7 +74,7 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
 
     final List<String> keys;
     try {
-      keys = keyGenerator.resolveKeys(locked.prefix(), locked.expression(), invocation.getThis(), invocation.getMethod(), invocation.getArguments());
+      keys = keyGenerator.resolveKeys(locked.prefix(), locked.expression(), invocation.getThis(), method, invocation.getArguments());
     } catch (final RuntimeException e) {
       throw new DistributedLockException("Cannot resolve keys to lock from expression: " + locked.expression(), e);
     }

distributed-lock-core/src/main/java/com/github/alturkovic/lock/key/SpelKeyGenerator.java

@@ -35,12 +35,9 @@
 import java.util.stream.Collectors;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.aop.support.AopUtils;
 import org.springframework.context.expression.AnnotatedElementKey;
 import org.springframework.context.expression.CachedExpressionEvaluator;
 import org.springframework.context.expression.MethodBasedEvaluationContext;
-import org.springframework.core.DefaultParameterNameDiscoverer;
-import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationContext;
@@ -52,18 +49,15 @@
 @EqualsAndHashCode(callSuper = false)
 public class SpelKeyGenerator extends CachedExpressionEvaluator implements KeyGenerator {
   private final ConversionService conversionService;
-  private final ParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
   private final Map<ExpressionKey, Expression> conditionCache = new ConcurrentHashMap<>();
   private final Map<AnnotatedElementKey, Method> targetMethodCache = new ConcurrentHashMap<>();
 
   @Override
   public List<String> resolveKeys(final String lockKeyPrefix, final String expression, final Object object, final Method method, final Object[] args) {
-    final AnnotatedElementKey annotatedElementKey = new AnnotatedElementKey(method, object.getClass());
-    final Method targetMethod = this.targetMethodCache.computeIfAbsent(annotatedElementKey, key -> AopUtils.getMostSpecificMethod(method, object.getClass()));
-    final EvaluationContext context = new MethodBasedEvaluationContext(object, targetMethod, args, this.parameterNameDiscoverer);
+    final EvaluationContext context = new MethodBasedEvaluationContext(object, method, args, super.getParameterNameDiscoverer());
     context.setVariable("executionPath", object.getClass().getCanonicalName() + "." + method.getName());
 
-    final List<String> keys = convertResultToList(getExpression(this.conditionCache, annotatedElementKey, expression).getValue(context));
+    final List<String> keys = convertResultToList(getExpression(this.conditionCache, new AnnotatedElementKey(method, object.getClass()), expression).getValue(context));
 
     if (keys.stream().anyMatch(Objects::isNull)) {
       throw new EvaluationConvertException("null keys are not supported: " + keys);

distributed-lock-example/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.alturkovic</groupId>
     <artifactId>distributed-lock</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
 
   <artifactId>distributed-lock-example</artifactId>

distributed-lock-jdbc/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.alturkovic</groupId>
     <artifactId>distributed-lock</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
 
   <artifactId>distributed-lock-jdbc</artifactId>

distributed-lock-mongo/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.alturkovic</groupId>
     <artifactId>distributed-lock</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
 
   <artifactId>distributed-lock-mongo</artifactId>

distributed-lock-redis/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.alturkovic</groupId>
     <artifactId>distributed-lock</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
 
   <artifactId>distributed-lock-redis</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.github.alturkovic</groupId>
   <artifactId>distributed-lock</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <packaging>pom</packaging>
 
   <name>distributed-lock</name>