Polishing.

Formatting.
Added a test.

Original pull request #2023
See #2008

Author: schauder

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

@@ -73,7 +73,7 @@
 public class StringBasedJdbcQuery extends AbstractJdbcQuery {
 
 	private static final String PARAMETER_NEEDS_TO_BE_NAMED = "For queries with named parameters you need to provide names for method parameters; Use @Param for query method parameters, or use the javac flag -parameters";
-	private final static String LOCKING_IS_NOT_SUPPORTED = "Currently, @Lock is supported only on derived queries. In other words, for queries created with @Query, the locking condition specified with @Lock does nothing. Offending method: ";
+	private static final String LOCKING_IS_NOT_SUPPORTED = "Currently, @Lock is supported only on derived queries. In other words, for queries created with @Query, the locking condition specified with @Lock does nothing. Offending method: ";
 	private final JdbcConverter converter;
 	private final RowMapperFactory rowMapperFactory;
 	private final ValueExpressionQueryRewriter.ParsedQuery parsedQuery;
@@ -457,6 +457,7 @@ public boolean requiresRowMapper() {
 
 	@Nullable
 	static <T> Constructor<T> findPrimaryConstructor(Class<T> clazz) {
+
 		try {
 			return clazz.getDeclaredConstructor();
 		} catch (NoSuchMethodException ex) {

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

@@ -53,6 +53,8 @@
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
+import org.springframework.data.relational.core.sql.LockMode;
+import org.springframework.data.relational.repository.Lock;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
@@ -252,7 +254,7 @@ void sliceQueryNotSupported() {
 		JdbcQueryMethod queryMethod = createMethod("sliceAll", Pageable.class);
 
 		assertThatThrownBy(
-				() -> new StringBasedJdbcQuery(queryMethod, operations,  result -> defaultRowMapper, converter, delegate))
+				() -> new StringBasedJdbcQuery(queryMethod, operations, result -> defaultRowMapper, converter, delegate))
 				.isInstanceOf(UnsupportedOperationException.class)
 				.hasMessageContaining("Slice queries are not supported using string-based queries");
 	}
@@ -278,6 +280,16 @@ void limitNotSupported() {
 				.isInstanceOf(UnsupportedOperationException.class);
 	}
 
+	@Test // GH-2023
+	void lockNotSupported() {
+
+		JdbcQueryMethod queryMethod = createMethod("unsupportedWithLock", Long.class);
+
+		assertThatThrownBy(
+				() -> new StringBasedJdbcQuery(queryMethod, operations, result -> defaultRowMapper, converter, delegate))
+				.isInstanceOf(UnsupportedOperationException.class);
+	}
+
 	@Test // GH-1212
 	void convertsEnumCollectionParameterIntoStringCollectionParameter() {
 
@@ -355,10 +367,12 @@ void spelCanBeUsedInsideQueries() {
 		List<EvaluationContextExtension> list = new ArrayList<>();
 		list.add(new MyEvaluationContextProvider());
 
-		QueryMethodValueEvaluationContextAccessor accessor = new QueryMethodValueEvaluationContextAccessor(new StandardEnvironment(), list);
+		QueryMethodValueEvaluationContextAccessor accessor = new QueryMethodValueEvaluationContextAccessor(
+				new StandardEnvironment(), list);
 		this.delegate = new ValueExpressionDelegate(accessor, ValueExpressionParser.create());
 
-		StringBasedJdbcQuery sut = new StringBasedJdbcQuery(queryMethod, operations, result -> defaultRowMapper, converter, delegate);
+		StringBasedJdbcQuery sut = new StringBasedJdbcQuery(queryMethod, operations, result -> defaultRowMapper, converter,
+				delegate);
 
 		ArgumentCaptor<SqlParameterSource> paramSource = ArgumentCaptor.forClass(SqlParameterSource.class);
 		ArgumentCaptor<String> query = ArgumentCaptor.forClass(String.class);
@@ -401,8 +415,8 @@ public SqlParameterSource extractParameterSource() {
 							mock(RelationResolver.class))
 					: this.converter;
 
-			StringBasedJdbcQuery query = new StringBasedJdbcQuery(method.getDeclaredQuery(), method, operations, result -> mock(RowMapper.class),
-					converter, delegate);
+			StringBasedJdbcQuery query = new StringBasedJdbcQuery(method.getDeclaredQuery(), method, operations,
+					result -> mock(RowMapper.class), converter, delegate);
 
 			query.execute(arguments);
 
@@ -438,7 +452,8 @@ private StringBasedJdbcQuery createQuery(JdbcQueryMethod queryMethod) {
 	}
 
 	private StringBasedJdbcQuery createQuery(JdbcQueryMethod queryMethod, String preparedReference, Object value) {
-		return new StringBasedJdbcQuery(queryMethod, operations, new StubRowMapperFactory(preparedReference, value), converter, delegate);
+		return new StringBasedJdbcQuery(queryMethod, operations, new StubRowMapperFactory(preparedReference, value),
+				converter, delegate);
 	}
 
 	interface MyRepository extends Repository<Object, Long> {
@@ -505,6 +520,10 @@ interface MyRepository extends Repository<Object, Long> {
 
 		@Query("select count(1) from person where (firstname, lastname) in (:tuples)")
 		Object findByListOfTuples(@Param("tuples") List<Object[]> tuples);
+
+		@Lock(value = LockMode.PESSIMISTIC_READ)
+		@Query("SELECT * FROM person WHERE id = :id")
+		DummyEntity unsupportedWithLock(Long id);
 	}
 
 	private static class CustomRowMapper implements RowMapper<Object> {