iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further generics in the rsql code

This commit is contained in:
eugenp 2016-10-29 10:14:27 +03:00
parent f81291006d
commit e3ec149927
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java
View File

@ -1,6 +1,5 @@
package org.baeldung.persistence.dao.rsql;
import org.baeldung.persistence.model.User;
import org.springframework.data.jpa.domain.Specification;
import cz.jirutka.rsql.parser.ast.AndNode;
@ -8,26 +7,26 @@ import cz.jirutka.rsql.parser.ast.ComparisonNode;
import cz.jirutka.rsql.parser.ast.OrNode;
import cz.jirutka.rsql.parser.ast.RSQLVisitor;
public class CustomRsqlVisitor<T> implements RSQLVisitor<Specification<User>, Void> {
public class CustomRsqlVisitor<T> implements RSQLVisitor<Specification<T>, Void> {
private UserRsqlSpecBuilder builder;
private GenericRsqlSpecBuilder<T> builder;
public CustomRsqlVisitor() {
builder = new UserRsqlSpecBuilder();
builder = new GenericRsqlSpecBuilder<T>();
}
@Override
public Specification<User> visit(final AndNode node, final Void param) {
public Specification<T> visit(final AndNode node, final Void param) {
return builder.createSpecification(node);
}
@Override
public Specification<User> visit(final OrNode node, final Void param) {
public Specification<T> visit(final OrNode node, final Void param) {
return builder.createSpecification(node);
}
@Override
public Specification<User> visit(final ComparisonNode node, final Void params) {
public Specification<T> visit(final ComparisonNode node, final Void params) {
return builder.createSpecification(node);
}

17
spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecBuilder.java → spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java
View File

@ -3,7 +3,6 @@ package org.baeldung.persistence.dao.rsql;
import java.util.ArrayList;
import java.util.List;
import org.baeldung.persistence.model.User;
import org.springframework.data.jpa.domain.Specifications;
import cz.jirutka.rsql.parser.ast.ComparisonNode;
@ -11,9 +10,9 @@ import cz.jirutka.rsql.parser.ast.LogicalNode;
import cz.jirutka.rsql.parser.ast.LogicalOperator;
import cz.jirutka.rsql.parser.ast.Node;
public class UserRsqlSpecBuilder {
public class GenericRsqlSpecBuilder<T> {
public Specifications<User> createSpecification(final Node node) {
public Specifications<T> createSpecification(final Node node) {
if (node instanceof LogicalNode) {
return createSpecification((LogicalNode) node);
}
@ -23,9 +22,9 @@ public class UserRsqlSpecBuilder {
return null;
}
public Specifications<User> createSpecification(final LogicalNode logicalNode) {
final List<Specifications<User>> specs = new ArrayList<Specifications<User>>();
Specifications<User> temp;
public Specifications<T> createSpecification(final LogicalNode logicalNode) {
final List<Specifications<T>> specs = new ArrayList<Specifications<T>>();
Specifications<T> temp;
for (final Node node : logicalNode.getChildren()) {
temp = createSpecification(node);
if (temp != null) {
@ -33,7 +32,7 @@ public class UserRsqlSpecBuilder {
}
}
Specifications<User> result = specs.get(0);
Specifications<T> result = specs.get(0);
if (logicalNode.getOperator() == LogicalOperator.AND) {
for (int i = 1; i < specs.size(); i++) {
@ -50,8 +49,8 @@ public class UserRsqlSpecBuilder {
return result;
}
public Specifications<User> createSpecification(final ComparisonNode comparisonNode) {
final Specifications<User> result = Specifications.where(new GenericRsqlSpecification<User>(comparisonNode.getSelector(), comparisonNode.getOperator(), comparisonNode.getArguments()));
public Specifications<T> createSpecification(final ComparisonNode comparisonNode) {
final Specifications<T> result = Specifications.where(new GenericRsqlSpecification<T>(comparisonNode.getSelector(), comparisonNode.getOperator(), comparisonNode.getArguments()));
return result;
}