Support lock renew in jdbc lockregistry

Author: stefanvassilev

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,13 @@
 
 package org.springframework.integration.jdbc.lock;
 
+import org.springframework.dao.CannotAcquireLockException;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.TransientDataAccessException;
+import org.springframework.integration.support.locks.ExpirableLockRegistry;
+import org.springframework.integration.util.UUIDConverter;
+import org.springframework.util.Assert;
+
 import java.time.Duration;
 import java.util.Iterator;
 import java.util.Map;
@@ -26,15 +33,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.springframework.dao.CannotAcquireLockException;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.TransientDataAccessException;
-import org.springframework.integration.support.locks.ExpirableLockRegistry;
-import org.springframework.integration.util.UUIDConverter;
-import org.springframework.util.Assert;
-
 /**
- *
  * An {@link ExpirableLockRegistry} using a shared database to co-ordinate the locks.
  * Provides the same semantics as the
  * {@link org.springframework.integration.support.locks.DefaultLockRegistry}, but the
@@ -47,7 +46,6 @@
  * @author Kai Zimmermann
  * @author Bartosz Rempuszewski
  * @author Gary Russell
- *
  * @since 4.3
  */
 public class JdbcLockRegistry implements ExpirableLockRegistry {
@@ -99,6 +97,20 @@ public void expireUnusedOlderThan(long age) {
 		}
 	}
 
+	public void renewLock(Lock lock) {
+		Assert.isInstanceOf(JdbcLock.class, lock);
+		JdbcLock jdbcLock = (JdbcLock) lock;
+
+		if (!jdbcLock.isAcquiredInThisProcess()) {
+			throw new IllegalMonitorStateException("You do not own mutex at " + jdbcLock.path);
+		}
+
+		if (!jdbcLock.mutex.acquire(jdbcLock.path)) {
+			throw new IllegalStateException("Could not renew mutex at " + jdbcLock.path);
+		}
+
+	}
+
 	private static final class JdbcLock implements Lock {
 
 		private final LockRepository mutex;

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +41,6 @@
 /**
  * @author Dave Syer
  * @author Artem Bilan
- *
  * @since 4.3
  */
 @ContextConfiguration
@@ -266,4 +266,20 @@ public void testTwoThreadsWrongOneUnlocks() throws Exception {
 		assertThat(((Exception) imse).getMessage()).contains("You do not own");
 	}
 
+	@Test
+	public void testLockRenew() throws Exception {
+		final Lock lock = this.registry.obtain("foo");
+
+		assertThat(lock.tryLock()).isTrue();
+		registry.renewLock(lock);
+	}
+
+	@Test
+	public void testLockRenewLockNotOwned() {
+		final Lock lock = this.registry.obtain("foo");
+
+		Assertions.assertThrows(IllegalMonitorStateException.class, () -> registry.renewLock(lock));
+	}
+
+
 }