Skip to content

Move duplicate code in QueryCriteria to new method. #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2023
Merged

Move duplicate code in QueryCriteria to new method. #1706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
* @author Michael Nitschinger
* @author Michael Reiche
* @author Mauro Monti
* @author Shubham Mishra
*/
public class QueryCriteria implements QueryCriteriaDefinition {

Expand Down Expand Up @@ -148,13 +149,7 @@ public QueryCriteria and(N1QLExpression key) {
}

public QueryCriteria and(QueryCriteria criteria) {
if (this.criteriaChain != null && !this.criteriaChain.contains(this)) {
throw new RuntimeException("criteria chain does not include this");
}
if (this.criteriaChain == null) {
this.criteriaChain = new LinkedList<>();
this.criteriaChain.add(this);
}
checkAndAddToCriteriaChain();
QueryCriteria newThis = wrap(this);
QueryCriteria qc = wrap(criteria);
newThis.criteriaChain.add(qc);
Expand Down Expand Up @@ -189,13 +184,7 @@ public QueryCriteria or(N1QLExpression key) {
}

public QueryCriteria or(QueryCriteria criteria) {
if (this.criteriaChain != null && !this.criteriaChain.contains(this)) {
throw new RuntimeException("criteria chain does not include this");
}
if (this.criteriaChain == null) {
this.criteriaChain = new LinkedList<>();
this.criteriaChain.add(this);
}
checkAndAddToCriteriaChain();
QueryCriteria newThis = wrap(this);
QueryCriteria qc = wrap(criteria);
qc.criteriaChain = newThis.criteriaChain;
Expand Down Expand Up @@ -719,4 +708,14 @@ public String toString() {
sb.append("}");
return sb.toString();
}

private void checkAndAddToCriteriaChain() {
if (this.criteriaChain != null && !this.criteriaChain.contains(this)) {
throw new RuntimeException("criteria chain does not include this");
}
if (this.criteriaChain == null) {
this.criteriaChain = new LinkedList<>();
this.criteriaChain.add(this);
}
}
}