From 896f13d991710dbbc49980cd80e3a3df6436c65b Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Thu, 4 Jul 2019 09:58:54 -0700 Subject: [PATCH] LPS-96589 no need to declare it, Hugo SF --- .../blogs/internal/trash/BlogsEntryTrashHandler.java | 7 ++----- .../web/internal/trash/BookmarksEntryTrashHandler.java | 7 ++----- .../web/internal/trash/BookmarksFolderTrashHandler.java | 7 ++----- .../internal/trash/CalendarBookingTrashHandler.java | 6 ++---- .../library/internal/trash/DLFileEntryTrashHandler.java | 7 ++----- .../library/internal/trash/DLFileShortcutTrashHandler.java | 6 ++---- .../library/internal/trash/DLFolderTrashHandler.java | 7 ++----- .../journal/internal/trash/JournalArticleTrashHandler.java | 7 ++----- .../journal/internal/trash/JournalFolderTrashHandler.java | 7 ++----- .../liferay/journal/trash/JournalArticleTrashHandler.java | 7 ++----- .../liferay/journal/trash/JournalFolderTrashHandler.java | 7 ++----- .../boards/internal/trash/MBCategoryTrashHandler.java | 7 ++----- .../boards/internal/trash/MBThreadTrashHandler.java | 7 ++----- .../wiki/web/internal/trash/WikiNodeTrashHandler.java | 7 ++----- .../wiki/web/internal/trash/WikiPageTrashHandler.java | 7 ++----- 15 files changed, 30 insertions(+), 73 deletions(-) diff --git a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java index d79d6d0602e1ab..f33ef0806672ca 100644 --- a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java +++ b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java @@ -104,12 +104,9 @@ public boolean isInTrash(long classPK) throws PortalException { public boolean isRestorable(long classPK) throws PortalException { BlogsEntry entry = _blogsEntryLocalService.getEntry(classPK); - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, entry.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + entry.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java index 23e56cf727d2a9..5cd8020a5f7aff 100644 --- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java +++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java @@ -155,12 +155,9 @@ public boolean isRestorable(long classPK) throws PortalException { } } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, entry.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + entry.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java index d0693735625f9a..e31c91e2d3ab9a 100644 --- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java +++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java @@ -175,12 +175,9 @@ public boolean isRestorable(long classPK) throws PortalException { } } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, folder.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + folder.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/trash/CalendarBookingTrashHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/trash/CalendarBookingTrashHandler.java index c1ced688fff716..354827e2af308d 100644 --- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/trash/CalendarBookingTrashHandler.java +++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/trash/CalendarBookingTrashHandler.java @@ -58,11 +58,9 @@ public boolean isRestorable(long classPK) throws PortalException { CalendarBooking calendarBooking = _calendarBookingLocalService.getCalendarBooking(classPK); - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, calendarBooking.getGroupId(), classPK, + PermissionThreadLocal.getPermissionChecker(), + calendarBooking.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileEntryTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileEntryTrashHandler.java index 7ee52c02146992..8c1705a933d940 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileEntryTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileEntryTrashHandler.java @@ -245,12 +245,9 @@ public boolean isRestorable(long classPK) throws PortalException { return false; } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, dlFileEntry.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + dlFileEntry.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileShortcutTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileShortcutTrashHandler.java index f7e33f69b8b16f..e4e41ff7e1a102 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileShortcutTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFileShortcutTrashHandler.java @@ -196,11 +196,9 @@ public boolean isRestorable(long classPK) throws PortalException { return false; } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, dlFileShortcut.getGroupId(), classPK, + PermissionThreadLocal.getPermissionChecker(), + dlFileShortcut.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; diff --git a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFolderTrashHandler.java b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFolderTrashHandler.java index f5c0d853ae76b5..0d14f1927f8984 100644 --- a/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFolderTrashHandler.java +++ b/modules/apps/document-library/document-library-service/src/main/java/com/liferay/document/library/internal/trash/DLFolderTrashHandler.java @@ -238,12 +238,9 @@ public boolean isRestorable(long classPK) throws PortalException { return false; } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, dlFolder.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + dlFolder.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java index 8bfd727091da3a..dfa884e5c9e21a 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java @@ -226,12 +226,9 @@ public boolean isRestorable(long classPK) throws PortalException { return false; } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, article.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + article.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalFolderTrashHandler.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalFolderTrashHandler.java index 7136fe0c66d16d..bbd66ba092a1c2 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalFolderTrashHandler.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalFolderTrashHandler.java @@ -202,12 +202,9 @@ public boolean isRestorable(long classPK) throws PortalException { } } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, folder.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + folder.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalArticleTrashHandler.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalArticleTrashHandler.java index cbea68ee262ab4..c3d68111758410 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalArticleTrashHandler.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalArticleTrashHandler.java @@ -241,12 +241,9 @@ public boolean isRestorable(long classPK) throws PortalException { return false; } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, article.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + article.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalFolderTrashHandler.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalFolderTrashHandler.java index d201d90f837946..f9e5e8487bb921 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalFolderTrashHandler.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/trash/JournalFolderTrashHandler.java @@ -212,12 +212,9 @@ public boolean isRestorable(long classPK) throws PortalException { } } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, folder.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + folder.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBCategoryTrashHandler.java b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBCategoryTrashHandler.java index c7d433cd59b252..8e068f3b20d287 100644 --- a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBCategoryTrashHandler.java +++ b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBCategoryTrashHandler.java @@ -366,12 +366,9 @@ public boolean isRestorable(long classPK) throws PortalException { } } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, category.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + category.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBThreadTrashHandler.java b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBThreadTrashHandler.java index 94cf2f420da26a..1fcb09c35655f0 100644 --- a/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBThreadTrashHandler.java +++ b/modules/apps/message-boards/message-boards-service/src/main/java/com/liferay/message/boards/internal/trash/MBThreadTrashHandler.java @@ -221,12 +221,9 @@ public boolean isRestorable(long classPK) throws PortalException { return false; } - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, thread.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), + thread.getGroupId(), classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiNodeTrashHandler.java b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiNodeTrashHandler.java index 5739975f5c2db1..60d1d2b02e6da6 100644 --- a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiNodeTrashHandler.java +++ b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiNodeTrashHandler.java @@ -188,12 +188,9 @@ public boolean isContainerModel() { public boolean isRestorable(long classPK) throws PortalException { WikiNode node = _wikiNodeLocalService.getNode(classPK); - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, node.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), node.getGroupId(), + classPK, TrashActionKeys.RESTORE)) { return false; } diff --git a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiPageTrashHandler.java b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiPageTrashHandler.java index 0478b1d6440f25..758a7192b5b8d8 100644 --- a/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiPageTrashHandler.java +++ b/modules/apps/wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiPageTrashHandler.java @@ -310,12 +310,9 @@ public boolean isRestorable(long classPK) throws PortalException { WikiPage page = _wikiPageLocalService.getLatestPage( classPK, WorkflowConstants.STATUS_ANY, false); - PermissionChecker permissionChecker = - PermissionThreadLocal.getPermissionChecker(); - if (!hasTrashPermission( - permissionChecker, page.getGroupId(), classPK, - TrashActionKeys.RESTORE)) { + PermissionThreadLocal.getPermissionChecker(), page.getGroupId(), + classPK, TrashActionKeys.RESTORE)) { return false; }