-
Notifications
You must be signed in to change notification settings - Fork 211
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Add support for CriteriaGroups
- Loading branch information
Showing
18 changed files
with
973 additions
and
357 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
src/main/java/org/mybatis/dynamic/sql/AndOrCriteriaGroup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* Copyright 2016-2022 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.mybatis.dynamic.sql; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Objects; | ||
|
||
/** | ||
* This class represents a criteria group with either an AND or an OR connector. | ||
* This class is intentionally NOT derived from SqlCriterion because we only want it to be | ||
* available where an AND or an OR condition is appropriate. | ||
* | ||
* @author Jeff Butler | ||
* @since 1.4.0 | ||
*/ | ||
public class AndOrCriteriaGroup { | ||
private final String connector; | ||
private final SqlCriterion initialCriterion; | ||
private final List<AndOrCriteriaGroup> subCriteria; | ||
|
||
private AndOrCriteriaGroup(Builder builder) { | ||
connector = Objects.requireNonNull(builder.connector); | ||
initialCriterion = Objects.requireNonNull(builder.initialCriterion); | ||
subCriteria = builder.subCriteria; | ||
} | ||
|
||
public String connector() { | ||
return connector; | ||
} | ||
|
||
public SqlCriterion initialCriterion() { | ||
return initialCriterion; | ||
} | ||
|
||
public List<AndOrCriteriaGroup> subCriteria() { | ||
return Collections.unmodifiableList(subCriteria); | ||
} | ||
|
||
public static class Builder { | ||
private String connector; | ||
private SqlCriterion initialCriterion; | ||
private final List<AndOrCriteriaGroup> subCriteria = new ArrayList<>(); | ||
|
||
public Builder withConnector(String connector) { | ||
this.connector = connector; | ||
return this; | ||
} | ||
|
||
public Builder withInitialCriterion(SqlCriterion initialCriterion) { | ||
this.initialCriterion = initialCriterion; | ||
return this; | ||
} | ||
|
||
public Builder withSubCriteria(List<AndOrCriteriaGroup> subCriteria) { | ||
this.subCriteria.addAll(subCriteria); | ||
return this; | ||
} | ||
|
||
public AndOrCriteriaGroup build() { | ||
return new AndOrCriteriaGroup(this); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright 2016-2022 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.mybatis.dynamic.sql; | ||
|
||
import java.util.Objects; | ||
|
||
/** | ||
* This class represents a criteria group without an AND or an OR connector. This is useful | ||
* in situations where the initial SqlCriterion in a list should be further grouped | ||
* as in an expression like ((A < 5 and B > 6) or C = 3) | ||
* | ||
* @author Jeff Butler, inspired by @JoshuaJeme | ||
* @since 1.4.0 | ||
*/ | ||
public class CriteriaGroup extends SqlCriterion { | ||
private final SqlCriterion initialCriterion; | ||
|
||
private CriteriaGroup(Builder builder) { | ||
super(builder); | ||
initialCriterion = Objects.requireNonNull(builder.initialCriterion); | ||
} | ||
|
||
public SqlCriterion initialCriterion() { | ||
return initialCriterion; | ||
} | ||
|
||
@Override | ||
public <R> R accept(SqlCriterionVisitor<R> visitor) { | ||
return visitor.visit(this); | ||
} | ||
|
||
public static class Builder extends AbstractBuilder<Builder> { | ||
private SqlCriterion initialCriterion; | ||
|
||
public Builder withInitialCriterion(SqlCriterion initialCriterion) { | ||
this.initialCriterion = initialCriterion; | ||
return this; | ||
} | ||
|
||
public CriteriaGroup build() { | ||
return new CriteriaGroup(this); | ||
} | ||
|
||
@Override | ||
protected Builder getThis() { | ||
return this; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.