fix: removed unreachable code (#4)

onecx · Sep 6, 2024 · 8de60a7 · 8de60a7
1 parent 7132c3c
commit 8de60a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/main/java/org/tkit/onecx/bookmark/domain/daos/BookmarkDAO.java b/src/main/java/org/tkit/onecx/bookmark/domain/daos/BookmarkDAO.java
@@ -35,9 +35,7 @@ public PageResult<Bookmark> findBookmarksByCriteria(BookmarkSearchCriteria crite
             addSearchStringPredicate(predicates, cb, root.get(Bookmark_.appId), criteria.getAppId());
             addSearchStringPredicate(predicates, cb, root.get(Bookmark_.userId), ApplicationContext.get().getPrincipal());
 
-            if (!predicates.isEmpty()) {
-                cq.where(predicates.toArray(new Predicate[] {}));
-            }
+            cq.where(predicates.toArray(new Predicate[] {}));
             cq.orderBy(cb.desc(root.get(AbstractTraceableEntity_.CREATION_DATE)));
             return createPageQuery(cq, Page.of(criteria.getPageNumber(), criteria.getPageSize())).getPageResult();
         } catch (Exception ex) {

diff --git a/src/main/java/org/tkit/onecx/bookmark/rs/internal/controllers/BookmarkRestController.java b/src/main/java/org/tkit/onecx/bookmark/rs/internal/controllers/BookmarkRestController.java
@@ -16,7 +16,6 @@
 import org.tkit.onecx.bookmark.domain.daos.BookmarkDAO;
 import org.tkit.onecx.bookmark.rs.internal.mappers.BookmarkMapper;
 import org.tkit.onecx.bookmark.rs.internal.mappers.ExceptionMapper;
-import org.tkit.quarkus.jpa.exceptions.ConstraintException;
 import org.tkit.quarkus.log.cdi.LogService;
 
 import gen.org.tkit.onecx.bookmark.rs.internal.BookmarksInternalApi;
@@ -79,11 +78,6 @@ public Response searchBookmarksByCriteria(BookmarkSearchCriteriaDTO bookmarkSear
         return Response.ok(bookmarkMapper.mapPage(bookmarks)).build();
     }
 
-    @ServerExceptionMapper
-    public RestResponse<ProblemDetailResponseDTO> exception(ConstraintException ex) {
-        return exceptionMapper.exception(ex);
-    }
-
     @ServerExceptionMapper
     public RestResponse<ProblemDetailResponseDTO> constraint(ConstraintViolationException ex) {
         return exceptionMapper.constraint(ex);

diff --git a/src/test/resources/data/test-internal.xml b/src/test/resources/data/test-internal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataset>
 
-	<!-- HELP -->
+	<!-- BOOKMARK -->
 	<BOOKMARK guid="11-111" optlock="0" display_name="displayName1" workspace_name="workspaceName1" app_id="appId1" user_id="test-user" product_name="productName1" tenant_id="default"/>
 
 </dataset>