diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecification.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java
similarity index 87%
rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecification.java
rename to spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java
index b7aaa14ba6..6609a87953 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecification.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java
@@ -8,18 +8,17 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.persistence.model.User;
 import org.springframework.data.jpa.domain.Specification;
 
 import cz.jirutka.rsql.parser.ast.ComparisonOperator;
 
-public class UserRsqlSpecification implements Specification<User> {
+public class GenericRsqlSpecification<T> implements Specification<T> {
 
     private String property;
     private ComparisonOperator operator;
     private List<String> arguments;
 
-    public UserRsqlSpecification(final String property, final ComparisonOperator operator, final List<String> arguments) {
+    public GenericRsqlSpecification(final String property, final ComparisonOperator operator, final List<String> arguments) {
         super();
         this.property = property;
         this.operator = operator;
@@ -27,7 +26,7 @@ public class UserRsqlSpecification implements Specification<User> {
     }
 
     @Override
-    public Predicate toPredicate(final Root<User> root, final CriteriaQuery<?> query, final CriteriaBuilder builder) {
+    public Predicate toPredicate(final Root<T> root, final CriteriaQuery<?> query, final CriteriaBuilder builder) {
         final List<Object> args = castArguments(root);
         final Object argument = args.get(0);
         switch (RsqlSearchOperation.getSimpleOperator(operator)) {
@@ -73,7 +72,7 @@ public class UserRsqlSpecification implements Specification<User> {
 
     // === private
 
-    private List<Object> castArguments(final Root<User> root) {
+    private List<Object> castArguments(final Root<T> root) {
         final List<Object> args = new ArrayList<Object>();
         final Class<? extends Object> type = root.get(property).getJavaType();
 
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecBuilder.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecBuilder.java
index 202370a64b..07bf557a7a 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecBuilder.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/UserRsqlSpecBuilder.java
@@ -51,7 +51,7 @@ public class UserRsqlSpecBuilder {
     }
 
     public Specifications<User> createSpecification(final ComparisonNode comparisonNode) {
-        final Specifications<User> result = Specifications.where(new UserRsqlSpecification(comparisonNode.getSelector(), comparisonNode.getOperator(), comparisonNode.getArguments()));
+        final Specifications<User> result = Specifications.where(new GenericRsqlSpecification<User>(comparisonNode.getSelector(), comparisonNode.getOperator(), comparisonNode.getArguments()));
         return result;
     }