Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-448 - Added infrastructure for 'deleteBy' queries.

Browse Source 
Add keywords 'delete' and 'remove' to PartTree indicating presence of delete intend.

Original pull request: #72.
This commit is contained in:
Christoph Strobl
2014-03-05 13:57:47 +01:00
committed by Oliver Gierke
parent cc57d38b42
commit 5d0f3b4b6d
2 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/org/springframework/data/repository/query/parser/PartTree.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2013 the original author or authors.
* Copyright 2008-2014 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.
@@ -35,10 +35,14 @@ import org.springframework.util.StringUtils;
*
* @author Oliver Gierke
* @author Thomas Darimont
* @author Christoph Strobl
*/
public class PartTree implements Iterable<OrPart> {
private static final Pattern PREFIX_TEMPLATE = Pattern.compile("^(find|read|get|count|query)(\\p{Lu}.*?)??By");
private static final String DELETE_PATTERN = "delete|remove";
private static final Pattern PREFIX_TEMPLATE = Pattern.compile("^(find|read|get|count|query|" + DELETE_PATTERN
+ ")(\\p{Lu}.*?)??By");
/*
* We look for a pattern of: keyword followed by
@@ -121,6 +125,16 @@ public class PartTree implements Iterable<OrPart> {
return subject.isCountProjection();
}
/**
* return true if the created {@link PartTree} is meant to be used for delete operation.
*
* @return
* @since 1.8
*/
public Boolean isDelete() {
return subject.isDelete();
}
/**
* Returns an {@link Iterable} of all parts contained in the {@link PartTree}.
*
@@ -221,19 +235,33 @@ public class PartTree implements Iterable<OrPart> {
*
* @author Phil Webb
* @author Oliver Gierke
* @author Christoph Strobl
*/
private static class Subject {
private static final String DISTINCT = "Distinct";
private static final Pattern COUNT_BY_TEMPLATE = Pattern.compile("^count(\\p{Lu}.*?)??By");
private static final Pattern DELETE_BY_TEMPLATE = Pattern.compile("^(" + DELETE_PATTERN + ")(\\p{Lu}.*?)??By");
private final boolean distinct;
private final boolean count;
private final boolean delete;
public Subject(String subject) {
this.distinct = subject == null ? false : subject.contains(DISTINCT);
this.count = subject == null ? false : COUNT_BY_TEMPLATE.matcher(subject).find();
this.count = matches(subject, COUNT_BY_TEMPLATE);
this.delete = matches(subject, DELETE_BY_TEMPLATE);
}
/**
* Returns {@literal true} if {@link Subject} matches {@link #DELETE_BY_TEMPLATE}.
*
* @return
* @since 1.8
*/
public Boolean isDelete() {
return delete;
}
public boolean isCountProjection() {
@@ -243,6 +271,10 @@ public class PartTree implements Iterable<OrPart> {
public boolean isDistinct() {
return distinct;
}
private final boolean matches(String subject, Pattern pattern) {
return subject == null ? false : pattern.matcher(subject).find();
}
}
/**