Skip to content

Commit f9569ea

Browse files
committed
refactoring again.
1 parent 7297829 commit f9569ea

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/fr/fxjavadevblog/aid/api/videogame/VideoGameResource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ public Response findAll(@BeanParam @Valid final Pagination pagination, @BeanPara
9494
PanacheQuery<VideoGame> query;
9595
Sort sort = QueryParameterUtils.createSort(pagination.getSortingClause());
9696

97-
filtering.setModelClass(VideoGame.class);
98-
List <Filter> filterings = filtering.getFilters();
97+
filtering.setModelClass(VideoGame.class);
9998

100-
if (CollectionUtils.isEmpty(filterings))
99+
if (filtering.isFilterPresent())
101100
{
102101
query = videoGameRepository.findAll(sort);
103102
}

src/main/java/fr/fxjavadevblog/aid/utils/jaxrs/Filtering.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import javax.ws.rs.core.UriInfo;
1919

2020
import org.apache.commons.beanutils.ConvertUtils;
21+
import org.apache.commons.collections4.CollectionUtils;
2122

2223
import fr.fxjavadevblog.aid.api.exceptions.ApiException;
2324
import lombok.AllArgsConstructor;
@@ -44,7 +45,6 @@ public class Filtering
4445
@Getter
4546
private Class<?> modelClass;
4647

47-
@Getter
4848
private List <Filter> filters;
4949

5050
private static Set <String> reservedWords = Stream.of("page","size","sort")
@@ -83,6 +83,11 @@ public void setModelClass(Class <?> clazz)
8383
parameters.forEach(convertParameterToFilter());
8484
}
8585

86+
public boolean isFilterPresent()
87+
{
88+
return CollectionUtils.isNotEmpty(filters);
89+
}
90+
8691

8792
public String getQuery()
8893
{

0 commit comments

Comments
 (0)