GH-219: Fix DynamoDbLockReg for skip blocking

Fixes #219

Turns out the `AmazonDynamoDBLockClient` doesn't have a proper logic to
determine correct `lookupTime` and if we want to skip blocking waits,
the item is always treated as not expired because just obtained item from DB
is updated to the current time for its `lookupTime` property

* Remove the logic in the `DynamoDbLockRegistry` setting `withShouldSkipBlockingWait(true)`

**Cherry-pick to `2.5.x`**

# Conflicts:
#	src/test/java/org/springframework/integration/aws/lock/DynamoDbLockRegistryTests.java

Author: artembilan

src/main/java/org/springframework/integration/aws/lock/DynamoDbLockRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -451,8 +451,7 @@ public void lock() {
 		private void setupDefaultAcquireLockOptionsBuilder() {
 			this.acquireLockOptionsBuilder
 					.withAdditionalTimeToWaitForLock(Long.MAX_VALUE - DynamoDbLockRegistry.this.leaseDuration)
-					.withRefreshPeriod(DynamoDbLockRegistry.this.refreshPeriod)
-					.withShouldSkipBlockingWait(false);
+					.withRefreshPeriod(DynamoDbLockRegistry.this.refreshPeriod);
 		}
 
 		@Override
@@ -506,13 +505,7 @@ public boolean tryLock(long time, TimeUnit unit) throws InterruptedException {
 			long additionalTimeToWait = Math
 					.max(TimeUnit.MILLISECONDS.convert(time, unit) - System.currentTimeMillis() + start, 0L);
 
-			this.acquireLockOptionsBuilder.withAdditionalTimeToWaitForLock(additionalTimeToWait)
-					.withRefreshPeriod(DynamoDbLockRegistry.this.refreshPeriod)
-					.withShouldSkipBlockingWait(false);
-
-			if (additionalTimeToWait == 0) {
-				this.acquireLockOptionsBuilder.withShouldSkipBlockingWait(true);
-			}
+			this.acquireLockOptionsBuilder.withAdditionalTimeToWaitForLock(additionalTimeToWait);
 
 			boolean acquired = false;
 			try {

src/test/java/org/springframework/integration/aws/lock/DynamoDbLockRegistryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -18,6 +18,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+
+import java.lang.reflect.Method;
+
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
@@ -41,10 +44,15 @@
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.util.ReflectionUtils;
 
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
+import com.amazonaws.services.dynamodbv2.AcquireLockOptions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBAsync;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBLockClient;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBLockClientOptions;
+import com.amazonaws.services.dynamodbv2.LockItem;
 import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest;
 import com.amazonaws.waiters.FixedDelayStrategy;
 import com.amazonaws.waiters.MaxAttemptsRetryStrategy;
@@ -328,6 +336,42 @@ void testTwoThreadsWrongOneUnlocks() throws Exception {
 		assertThat(((Exception) imse).getMessage()).contains("You do not own");
 	}
 
+	@Test
+	void abandonedLock() throws Exception {
+		Method awaitForActiveMethod = ReflectionUtils.findMethod(DynamoDbLockRegistry.class, "awaitForActive");
+		ReflectionUtils.makeAccessible(awaitForActiveMethod);
+		ReflectionUtils.invokeMethod(awaitForActiveMethod, this.dynamoDbLockRegistry);
+
+		AmazonDynamoDBLockClientOptions lockClientOptions =
+				AmazonDynamoDBLockClientOptions.builder(DYNAMO_DB, DynamoDbLockRegistry.DEFAULT_TABLE_NAME)
+						.withPartitionKeyName(DynamoDbLockRegistry.DEFAULT_PARTITION_KEY_NAME)
+						.withSortKeyName(DynamoDbLockRegistry.DEFAULT_SORT_KEY_NAME)
+						.withCreateHeartbeatBackgroundThread(false)
+						.withLeaseDuration(2L)
+						.build();
+		AmazonDynamoDBLockClient lockClient = new AmazonDynamoDBLockClient(lockClientOptions);
+
+		AcquireLockOptions lockOptions =
+				AcquireLockOptions.builder("foo")
+				.withReplaceData(false)
+				.withSortKey(DynamoDbLockRegistry.DEFAULT_SORT_KEY)
+				.build();
+
+		LockItem lockItem = lockClient.acquireLock(lockOptions);
+		assertThat(lockItem).isNotNull();
+
+		lockClient.close();
+
+		Lock lock = this.dynamoDbLockRegistry.obtain("foo");
+		int n = 0;
+		while (!lock.tryLock() && n++ < 100) {
+			Thread.sleep(100);
+		}
+
+		assertThat(n).isLessThan(100);
+		lock.unlock();
+	}
+
 	@Configuration
 	public static class ContextConfiguration {