DATACOUCH-1055 - Queries on field annotated properties have original name.

Queries on field annotated properties have original name.

They should use getFieldName() which will use the annotated if it exists.

Author: mikereiche

pom.xml

@@ -25,16 +25,16 @@
     </properties>
 
     <dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers-bom</artifactId>
-				<version>${testcontainers}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
@@ -173,6 +173,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>3.1.0.RELEASE</version>
             <scope>test</scope>
         </dependency>
 
@@ -279,6 +280,14 @@
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

src/test/java/org/springframework/data/couchbase/domain/Person.java

@@ -18,7 +18,6 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import com.couchbase.client.core.deps.com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
@@ -53,6 +52,7 @@ public Person(String firstname, String lastname) {
 		this();
 		setFirstname(firstname);
 		setLastname(lastname);
+		setMiddlename("Nick");
 	}
 
 	public Person(int id, String firstname, String lastname) {

src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java

@@ -15,15 +15,16 @@
  */
 package org.springframework.data.couchbase.domain;
 
-import com.couchbase.client.java.query.QueryScanConsistency;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.couchbase.repository.ScanConsistency;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+import com.couchbase.client.java.query.QueryScanConsistency;
 
 /**
  * @author Michael Reiche
@@ -107,6 +108,9 @@ public interface PersonRepository extends CrudRepository<Person, String> {
 
 	void deleteAll();
 
-	@ScanConsistency(query=QueryScanConsistency.REQUEST_PLUS)
+	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 	List<Person> findByAddressStreet(String street);
+
+	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+	List<Person> findByMiddlename(String nickName);
 }

src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java

@@ -76,6 +76,8 @@
 import com.couchbase.client.core.error.CouchbaseException;
 import com.couchbase.client.core.error.IndexExistsException;
 import com.couchbase.client.java.query.QueryScanConsistency;
+import com.couchbase.client.java.query.QueryOptions;
+import com.couchbase.client.java.query.QueryScanConsistency;
 
 /**
  * Repository tests
@@ -133,6 +135,22 @@ void nestedFind() {
 			personRepository.save(person);
 			List<Person> persons = personRepository.findByAddressStreet("Maple");
 			assertEquals(1, persons.size());
+			List<Person> persons2 = personRepository.findByMiddlename("Nick");
+			assertEquals(1, persons2.size());
+		} finally {
+			personRepository.deleteById(person.getId().toString());
+		}
+	}
+
+	@Test
+	void annotatedFieldFind() {
+		Person person = null;
+		try {
+			person = new Person(1, "first", "last");
+			person.setMiddlename("Nick"); // middlename is stored as nickname
+			personRepository.save(person);
+			List<Person> persons2 = personRepository.findByMiddlename("Nick");
+			assertEquals(1, persons2.size());
 		} finally {
 			personRepository.deleteById(person.getId().toString());
 		}
@@ -166,12 +184,14 @@ void findBySimpleProperty() {
 		try {
 			vie = new Airport("airports::vie", "vie", "loww");
 			vie = airportRepository.save(vie);
+			Airport airport2 = airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(QueryScanConsistency.NOT_BOUNDED)).findByIata(vie.getIata());
+			assertEquals(airport2.getId(), vie.getId());
+
 			List<Airport> airports = airportRepository.findAllByIata("vie");
 			assertEquals(1, airports.size());
 			Airport airport1 = airportRepository.findById(airports.get(0).getId()).get();
 			assertEquals(airport1.getIata(), vie.getIata());
-			Airport airport2 = airportRepository.findByIata(airports.get(0).getIata());
-			assertEquals(airport1.getId(), vie.getId());
+
 		} finally {
 			airportRepository.delete(vie);
 		}
@@ -401,7 +421,9 @@ void findBySimplePropertyAudited() {
 	private void sleep(int millis) {
 		try {
 			Thread.sleep(millis); // so they are executed out-of-order
-		} catch (InterruptedException ie) {}
+		} catch (InterruptedException ie) {
+			;
+		}
 	}
 
 	@Configuration

src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java

@@ -32,6 +32,8 @@
 import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
 import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
 import org.springframework.data.couchbase.core.query.Query;
+import org.springframework.data.couchbase.domain.Person;
+import org.springframework.data.couchbase.domain.PersonRepository;
 import org.springframework.data.couchbase.domain.User;
 import org.springframework.data.couchbase.domain.UserRepository;
 import org.springframework.data.mapping.context.MappingContext;
@@ -75,6 +77,19 @@ void createsQueryCorrectly() throws Exception {
 		assertEquals(query.export(), " WHERE " + where(i("firstname")).is("Oliver").export());
 	}
 
+	@Test
+	void createsQueryFieldAnnotationCorrectly() throws Exception {
+		String input = "findByMiddlename";
+		PartTree tree = new PartTree(input, Person.class);
+		Method method = PersonRepository.class.getMethod(input, String.class);
+
+		N1qlQueryCreator creator = new N1qlQueryCreator(tree, getAccessor(getParameters(method), "Oliver"), null,
+				converter, bucketName);
+		Query query = creator.createQuery();
+
+		assertEquals(query.export(), " WHERE " + where("nickname").is("Oliver").export());
+	}
+
 	@Test
 	void queryParametersArray() throws Exception {
 		String input = "findByFirstnameIn";