LPS-96589 no need to declare it, Hugo SF

liferay · Jul 4, 2019 · 896f13d · 896f13d
1 parent 9144537
commit 896f13d
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 73 deletions.
diff --git a/.../blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java b/.../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/...eb/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java b/...eb/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/...b/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java b/...b/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/...ervice/src/main/java/com/liferay/calendar/internal/trash/CalendarBookingTrashHandler.java b/...ervice/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/...ce/src/main/java/com/liferay/document/library/internal/trash/DLFileEntryTrashHandler.java b/...ce/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/...src/main/java/com/liferay/document/library/internal/trash/DLFileShortcutTrashHandler.java b/...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/...rvice/src/main/java/com/liferay/document/library/internal/trash/DLFolderTrashHandler.java b/...rvice/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/...-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java b/...-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/...l-service/src/main/java/com/liferay/journal/internal/trash/JournalFolderTrashHandler.java b/...l-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/...l/journal-service/src/main/java/com/liferay/journal/trash/JournalArticleTrashHandler.java b/...l/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/...al/journal-service/src/main/java/com/liferay/journal/trash/JournalFolderTrashHandler.java b/...al/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/...rvice/src/main/java/com/liferay/message/boards/internal/trash/MBCategoryTrashHandler.java b/...rvice/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/...service/src/main/java/com/liferay/message/boards/internal/trash/MBThreadTrashHandler.java b/...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/...wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiNodeTrashHandler.java b/...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/...wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/trash/WikiPageTrashHandler.java b/...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;
 		}