Polishing.

Refactored the unit tests to include a negative case and to separate the different scenarios tested.

Removed the default LockMode from the Lock annotation.
I have the feeling that most users will assume an exclusive Lock when none is specified, but also don't want to request stronger locks than required.

Original pull request #1158
See #1041

Author: schauder

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Lock.java

@@ -34,6 +34,6 @@
 	/**
 	 * Defines which type of {@link LockMode} we want to use.
 	 */
-	LockMode value() default LockMode.PESSIMISTIC_READ;
+	LockMode value();
 
 }

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

@@ -335,6 +335,7 @@ public void findAllByQueryName() {
 
 	@Test
 	void findAllByFirstnameWithLock() {
+
 		DummyEntity dummyEntity = createDummyEntity();
 		repository.save(dummyEntity);
 		assertThat(repository.findAllByName(dummyEntity.getName())).hasSize(1);

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java

@@ -25,7 +25,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.relational.core.sql.LockMode;
@@ -123,28 +122,31 @@ public void returnsNullIfNoQueryIsFound() throws NoSuchMethodException {
 	}
 
 	@Test // GH-1041
-	void returnsQueryMethodWithLock() throws NoSuchMethodException {
+	void returnsQueryMethodWithCorrectLockTypeWriteLock() throws NoSuchMethodException {
 
 		JdbcQueryMethod queryMethodWithWriteLock = createJdbcQueryMethod("queryMethodWithWriteLock");
-		JdbcQueryMethod queryMethodWithReadLock = createJdbcQueryMethod("queryMethodWithReadLock");
 
-		assertThat(queryMethodWithWriteLock.hasLockMode()).isTrue();
-		assertThat(queryMethodWithReadLock.hasLockMode()).isTrue();
+		assertThat(queryMethodWithWriteLock.lookupLockAnnotation()).isPresent();
+		assertThat(queryMethodWithWriteLock.lookupLockAnnotation().get().value()).isEqualTo(LockMode.PESSIMISTIC_WRITE);
 	}
 
 	@Test // GH-1041
-	void returnsQueryMethodWithCorrectLockType() throws NoSuchMethodException {
+	void returnsQueryMethodWithCorrectLockTypeReadLock() throws NoSuchMethodException {
 
-		JdbcQueryMethod queryMethodWithWriteLock = createJdbcQueryMethod("queryMethodWithWriteLock");
 		JdbcQueryMethod queryMethodWithReadLock = createJdbcQueryMethod("queryMethodWithReadLock");
 
-		assertThat(queryMethodWithWriteLock.lookupLockAnnotation()).isPresent();
 		assertThat(queryMethodWithReadLock.lookupLockAnnotation()).isPresent();
-
-		assertThat(queryMethodWithWriteLock.lookupLockAnnotation().get().value()).isEqualTo(LockMode.PESSIMISTIC_WRITE);
 		assertThat(queryMethodWithReadLock.lookupLockAnnotation().get().value()).isEqualTo(LockMode.PESSIMISTIC_READ);
 	}
 
+	@Test // GH-1041
+	void returnsQueryMethodWithCorrectLockTypeNoLock() throws NoSuchMethodException {
+
+		JdbcQueryMethod queryMethodWithWriteLock = createJdbcQueryMethod("queryMethodName");
+
+		assertThat(queryMethodWithWriteLock.lookupLockAnnotation()).isEmpty();
+	}
+
 	@Lock(LockMode.PESSIMISTIC_WRITE)
 	@Query
 	private void queryMethodWithWriteLock() {}