allow querying complex expressions in JPA content assist

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositoryPrefixSensitiveCompletionProvider.java

@@ -111,10 +111,11 @@ private static String buildSignature(String methodName, Map<String, DomainProper
 		List<String> parameters = parseResult.parameters();
 		for(int i = 0; i < parameters.size(); i++){
 			String param = parameters.get(i);
-			if (properties.containsKey(param)) {
-				signatureBuilder.append(properties.get(param).getType().getSimpleName());
-			} else {
+			DomainType type = findExpressionType(properties, param);
+			if (type == null) {
 				signatureBuilder.append("Object");
+			}else {
+				signatureBuilder.append(type.getSimpleName());
 			}
 			signatureBuilder.append(" ");
 			signatureBuilder.append(StringUtils.uncapitalize(param));
@@ -126,6 +127,27 @@ private static String buildSignature(String methodName, Map<String, DomainProper
 		return signatureBuilder.toString();
 	}
 
+	private static DomainType findExpressionType(Map<String, DomainProperty> properties, String param) {
+		String[] splitByUnderscore = param.split("_");
+		if(properties.containsKey(splitByUnderscore[0])) {
+			DomainType type = properties.get(splitByUnderscore[0]).getType();
+			for (int j = 1; j < splitByUnderscore.length && type != null; j++) {
+				type = findMatchingParameter(splitByUnderscore[j], type);
+			}
+			return type;
+		}
+		return null;
+	}
+
+	private static DomainType findMatchingParameter(String name, DomainType type) {
+		for(DomainProperty prop : type.getProperties()){
+			if (prop.getName().equals(name)) {
+				return prop.getType();
+			}
+		}
+		return null;
+	}
+
 	private static void addQueryStartProposals(Collection<ICompletionProposal> completions, String prefix, int offset) {
 		for(QueryMethodSubject queryMethodSubject : QueryMethodSubject.QUERY_METHOD_SUBJECTS){
 			String toInsert = queryMethodSubject.key() + "By";

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositoryCompletionProcessorTest.java

@@ -89,6 +89,7 @@ void testPrefixSensitiveCompletionsCompleteMethod() throws Exception {
     @Test
     void testPrefixSensitiveCompletionsCompleteMethodReturnTypePresent() throws Exception {
     	checkCompletions("List<Customer> findByFirstNameAndLastName", "List<Customer> findByFirstNameAndLastName(String firstName, String lastName);");
+    	checkCompletions("boolean existsByFirstNameAndLastName", "boolean existsByFirstNameAndLastName(String firstName, String lastName);");
     }
 
     @Test
@@ -135,6 +136,12 @@ void testPropertyProposals() throws Exception {
     			"findByLastName");
     }
 
+    @Test
+    void findByComplexExpression() throws Exception {
+    	checkCompletions("findByResponsibleEmployee", "List<Customer> findByResponsibleEmployee(Employee responsibleEmployee);");
+    	checkCompletions("findByResponsibleEmployee_SocialSecurityNumber", "List<Customer> findByResponsibleEmployee_SocialSecurityNumber(Long responsibleEmployee_SocialSecurityNumber);");
+    }
+
 	private void checkCompletions(String alredyPresent, String... expectedCompletions) throws Exception {
 		prepareCase("{\n}", "{\n\t" + alredyPresent + "<*>");
     	assertContainsAnnotationCompletions(Arrays.stream(expectedCompletions).map(expected -> "\t" + expected + "<*>").toArray(String[]::new));

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Application.java

@@ -9,39 +9,39 @@
 
 @SpringBootApplication
 public class Application {
-	
+
 	private static final Logger log = LoggerFactory.getLogger(Application.class);
-	
+
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class);
 	}
-	
+
 	@Bean
 	public CommandLineRunner demo(CustomerRepository repository) {
 		return args -> {
-			Employee employee = new Employee("Margot", "Al-Harazi");
+			Employee employee = new Employee(1234, "Margot", "Al-Harazi");
 			// save a couple of customers
 			repository.save(new Customer("Jack", "Bauer", employee));
 			repository.save(new Customer("Chloe", "O'Brian", employee));
 			repository.save(new Customer("Kim", "Bauer", employee));
 			repository.save(new Customer("David", "Palmer", employee));
 			repository.save(new Customer("Michelle", "Dessler", employee));
-			
+
 			// fetch all customers
 			log.info("Customers found with findAll():");
 			log.info("-------------------------------");
 			for(Customer customer : repository.findAll()){
 				log.info(customer.toString());
 			}
 			log.info("");
-			
+
 			// fetch an individual customer by ID
 			Customer customer = repository.findOne(1L);
 			log.info("Customer found with findOne(1L):");
 			log.info("--------------------------------");
 			log.info(customer.toString());
 			log.info("");
-			
+
 			// fetch customers by last name
 			log.info("Customer found with findByLastName('Bauer'):");
 			log.info("--------------------------------------------");
@@ -51,5 +51,5 @@ public CommandLineRunner demo(CustomerRepository repository) {
 			log.info("");
 		};
 	}
-	
+
 }

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Employee.java

@@ -8,39 +8,39 @@
 
 @Entity
 public class Employee {
-	
+
 	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	private Long id;
+	private Long socialSecurityNumber;
 	private String firstName;
 	private String lastName;
-	
+
 	protected Employee() {
 	}
-
-	public Employee(String firstName, String lastName) {
+
+	public Employee(long socialSecurityNumber, String firstName, String lastName) {
+		this.socialSecurityNumber = socialSecurityNumber;
 		this.firstName = firstName;
 		this.lastName = lastName;
 	}
-	
+
 	@Override
 	public String toString() {
 		return String.format(
-				"Employee[id=%d, firstName='%s', lastName='%s']",
-				id, firstName, lastName
+				"Employee[socialSecurityNumber=%d, firstName='%s', lastName='%s']",
+				socialSecurityNumber, firstName, lastName
 		);
 	}
-	
+
 // end::sample[]
-	
-	public Long getId() {
-		return id;
+
+	public Long getSocialSecurityNumber() {
+		return socialSecurityNumber;
 	}
-	
+
 	public String getFirstName() {
 		return firstName;
 	}
-	
+
 	public String getLastName() {
 		return lastName;
 	}