From 34682083fa667f58655b73009106928f8ae2d63a Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Tue, 8 Jul 2025 11:18:11 -0700 Subject: [PATCH] Eliminate some warnings --- .../org/labkey/cageui/CageUIController.java | 7 ++- .../cageui/query/LayoutHistoryTable.java | 5 +- .../labkey/cageui/query/RackTypesTable.java | 3 +- .../org/labkey/cageui/query/RacksTable.java | 9 +-- .../ETLChemistryAnalyzerController.java | 7 ++- .../WNPRC_PurchasingController.java | 38 ++++++++----- .../WNPRC_PurchasingFolderType.java | 2 +- .../WNPRC_VirologyController.java | 55 +++++++++---------- .../labkey/wnprc_r24/wnprc_r24Controller.java | 7 ++- .../labkey/wnprc_u24/wnprc_u24Controller.java | 7 ++- 10 files changed, 68 insertions(+), 72 deletions(-) diff --git a/CageUI/src/org/labkey/cageui/CageUIController.java b/CageUI/src/org/labkey/cageui/CageUIController.java index 5dc5e353d..22e742783 100644 --- a/CageUI/src/org/labkey/cageui/CageUIController.java +++ b/CageUI/src/org/labkey/cageui/CageUIController.java @@ -38,14 +38,15 @@ public CageUIController() } @RequiresPermission(ReadPermission.class) - public class BeginAction extends SimpleViewAction + public static class BeginAction extends SimpleViewAction { + @Override public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/cageui/view/hello.jsp"); + return new JspView<>("/org/labkey/cageui/view/hello.jsp"); } + @Override public void addNavTrail(NavTree root) { } } - } diff --git a/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java b/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java index 0dc175656..096345544 100644 --- a/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java +++ b/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java @@ -41,12 +41,9 @@ import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission; import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.labkey.api.query.QueryUpdateService.ConfigParameters.PreferPKOverObjectUriAsKey; - public class LayoutHistoryTable extends SimpleUserSchema.SimpleTable { public LayoutHistoryTable(CageUIUserSchema schema, TableInfo table, ContainerFilter cf) @@ -69,7 +66,7 @@ public UpdateService(SimpleUserSchema.SimpleTable ti) // This checks permission before any data modification occurs @Override - public boolean hasPermission(@NotNull UserPrincipal user, Class perm) + public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class perm) { boolean hasPermission = super.hasPermission(user, perm); boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class; diff --git a/CageUI/src/org/labkey/cageui/query/RackTypesTable.java b/CageUI/src/org/labkey/cageui/query/RackTypesTable.java index fbd650254..12f9164fd 100644 --- a/CageUI/src/org/labkey/cageui/query/RackTypesTable.java +++ b/CageUI/src/org/labkey/cageui/query/RackTypesTable.java @@ -39,7 +39,6 @@ import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission; import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -65,7 +64,7 @@ public UpdateService(SimpleUserSchema.SimpleTable ti) // This checks permission before any data modification occurs @Override - public boolean hasPermission(@NotNull UserPrincipal user, Class perm) + public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class perm) { boolean hasPermission = super.hasPermission(user, perm); boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class; diff --git a/CageUI/src/org/labkey/cageui/query/RacksTable.java b/CageUI/src/org/labkey/cageui/query/RacksTable.java index eafb9f7fa..3c15c21c5 100644 --- a/CageUI/src/org/labkey/cageui/query/RacksTable.java +++ b/CageUI/src/org/labkey/cageui/query/RacksTable.java @@ -26,26 +26,19 @@ import org.labkey.api.query.BatchValidationException; import org.labkey.api.query.DuplicateKeyException; import org.labkey.api.query.InvalidKeyException; -import org.labkey.api.query.QueryService; import org.labkey.api.query.QueryUpdateService; import org.labkey.api.query.QueryUpdateServiceException; -import org.labkey.api.query.RuntimeValidationException; import org.labkey.api.query.SimpleQueryUpdateService; import org.labkey.api.query.SimpleUserSchema; -import org.labkey.api.query.ValidationException; import org.labkey.api.security.User; import org.labkey.api.security.UserPrincipal; import org.labkey.api.security.permissions.DeletePermission; import org.labkey.api.security.permissions.InsertPermission; import org.labkey.api.security.permissions.Permission; import org.labkey.api.security.permissions.UpdatePermission; -import org.labkey.api.view.UnauthorizedException; -import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission; -import org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission; import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission; import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -71,7 +64,7 @@ public UpdateService(SimpleUserSchema.SimpleTable ti) // This checks permission before any data modification occurs @Override - public boolean hasPermission(@NotNull UserPrincipal user, Class perm) + public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class perm) { boolean hasPermission = super.hasPermission(user, perm); boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class; diff --git a/ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerController.java b/ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerController.java index 34d2fe5af..e8c0745c1 100644 --- a/ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerController.java +++ b/ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerController.java @@ -36,11 +36,12 @@ public ETLChemistryAnalyzerController() } @RequiresPermission(ReadPermission.class) - public class BeginAction extends SimpleViewAction + public static class BeginAction extends SimpleViewAction { - public ModelAndView getView(Object o, BindException errors) throws Exception + @Override + public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/ETLChemistryAnalyzer/view/hello.jsp"); + return new JspView<>("/org/labkey/ETLChemistryAnalyzer/view/hello.jsp"); } @Override diff --git a/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java b/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java index f458b0ed2..7e30cd010 100644 --- a/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java +++ b/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java @@ -105,7 +105,7 @@ public WNPRC_PurchasingController() @NotNull private List getFolderAdmins() { - List folderAdminGroups = getContainer().getPolicy().getAssignments().stream().filter(roleAssignment -> roleAssignment.getRole().getName().equals(FOLDER_ADMIN_ROLE)).collect(Collectors.toList()); + List folderAdminGroups = getContainer().getPolicy().getAssignments().stream().filter(roleAssignment -> roleAssignment.getRole().getName().equals(FOLDER_ADMIN_ROLE)).toList(); List folderAdmins = new ArrayList<>(); for (RoleAssignment folderAdmin : folderAdminGroups) { @@ -128,50 +128,57 @@ private List getFolderAdmins() } @RequiresPermission(InsertPermission.class) - public class RequesterAction extends SimpleViewAction + public static class RequesterAction extends SimpleViewAction { + @Override public ModelAndView getView(Object o, BindException errors) { - WebPartFactory factory = Portal.getPortalPartCaseInsensitive("WNPRC Purchasing Requester"); + WebPartFactory factory = Portal.getPortalPart("WNPRC Purchasing Requester"); Portal.WebPart part = factory.createWebPart(); getPageConfig().setTitle("Purchasing Requester"); return Portal.getWebPartViewSafe(factory, getViewContext(), part); } + @Override public void addNavTrail(NavTree root) { } } @RequiresPermission(AdminPermission.class) - public class PurchaseAdminAction extends SimpleViewAction + public static class PurchaseAdminAction extends SimpleViewAction { + @Override public ModelAndView getView(Object o, BindException errors) { - WebPartFactory factory = Portal.getPortalPartCaseInsensitive("WNPRC Purchasing Admin"); + WebPartFactory factory = Portal.getPortalPart("WNPRC Purchasing Admin"); getPageConfig().setTitle("Purchasing Admin"); Portal.WebPart part = factory.createWebPart(); return Portal.getWebPartViewSafe(factory, getViewContext(), part); } + @Override public void addNavTrail(NavTree root) { } } @RequiresPermission(UpdatePermission.class) - public class PurchaseReceiverAction extends SimpleViewAction + public static class PurchaseReceiverAction extends SimpleViewAction { + @Override public ModelAndView getView(Object o, BindException errors) { - WebPartFactory factory = Portal.getPortalPartCaseInsensitive("WNPRC Purchasing Receiver"); + WebPartFactory factory = Portal.getPortalPart("WNPRC Purchasing Receiver"); getPageConfig().setTitle("Purchasing Receiver"); Portal.WebPart part = factory.createWebPart(); return Portal.getWebPartViewSafe(factory, getViewContext(), part); } + @Override public void addNavTrail(NavTree root) { } } @RequiresPermission(ReadPermission.class) - public class PurchasingRequestAction extends SimpleViewAction + public static class PurchasingRequestAction extends SimpleViewAction { + @Override public ModelAndView getView(Object o, BindException errors) { ModuleHtmlView view = ModuleHtmlView.get(ModuleLoader.getInstance().getModule("WNPRC_Purchasing"), ModuleHtmlView.getGeneratedViewPath("RequestEntry")); @@ -180,11 +187,12 @@ public ModelAndView getView(Object o, BindException errors) return view; } + @Override public void addNavTrail(NavTree root) { } } @RequiresPermission(InsertPermission.class) - public class GetFolderAdminsAction extends ReadOnlyApiAction + public class GetFolderAdminsAction extends ReadOnlyApiAction { @Override public Object execute(Object o, BindException errors) @@ -249,7 +257,7 @@ public Object execute(RequestForm requestForm, BindException errors) throws Exce List validationExceptions = WNPRC_PurchasingManager.get().submitRequestForm(getUser(), getContainer(), requestForm); - if (validationExceptions.size() > 0) + if (!validationExceptions.isEmpty()) { throw new BatchValidationException(validationExceptions, null); } @@ -287,7 +295,7 @@ private void sendRequestChangeEmailNotification(String oldStatus, EmailTemplateF List usersWithInsertPerm = SecurityManager.getUsersWithPermissions(getContainer(), Collections.singleton(InsertPermission.class)); //get the lab end user who originated the request - List labEndUsers = usersWithInsertPerm.stream().filter(u -> u.getUserId() == emailTemplateForm.getRequester().getUserId()).collect(Collectors.toList()); + List labEndUsers = usersWithInsertPerm.stream().filter(u -> u.getUserId() == emailTemplateForm.getRequester().getUserId()).toList(); User endUser = labEndUsers.size() == 1 ? labEndUsers.get(0) : null; //request status change email notification @@ -351,16 +359,16 @@ private void sendRequestChangeEmailNotification(String oldStatus, EmailTemplateF List removed = oldLineItems.stream().filter(o1 -> updatedLineItems.stream().noneMatch(o2 -> o2.getRowId() == o1.getRowId())).collect(Collectors.toList()); List quantityChange = updatedLineItems.stream().filter(o1 -> oldLineItems.stream().noneMatch(o2 -> o1.getRowId() == o2.getRowId() - && o2.getQuantity() == o1.getQuantity())).collect(Collectors.toList()); + && o2.getQuantity() == o1.getQuantity())).toList(); boolean fullQuantityReceived = updatedLineItems.stream().filter(o2 -> o2.getQuantityReceived() >= o2.getQuantity()).count() == updatedLineItems.size(); - if (removed.size() > 0 || quantityChange.size() > 0 || fullQuantityReceived) + if (!removed.isEmpty() || !quantityChange.isEmpty() || fullQuantityReceived) { LineItemChangeEmailTemplate lineItemChangeEmailTemplate = EmailTemplateService.get().getEmailTemplate(LineItemChangeEmailTemplate.class); lineItemChangeEmailTemplate.setUpdatedLineItemsList(updatedLineItems); lineItemChangeEmailTemplate.setOldLineItemsList(oldLineItems); - lineItemChangeEmailTemplate.setDeletedLineItemFlag(removed.size() > 0); + lineItemChangeEmailTemplate.setDeletedLineItemFlag(!removed.isEmpty()); lineItemChangeEmailTemplate.setFullQuantityReceivedFlag(fullQuantityReceived); lineItemChangeEmailTemplate.setNotificationBean(emailTemplateForm); String emailSubject = lineItemChangeEmailTemplate.renderSubject(getContainer()); @@ -604,7 +612,7 @@ public void setUnitCost(double unitCost) } } - public class EmailTemplateForm + public static class EmailTemplateForm { Integer _rowId; String _vendor; diff --git a/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingFolderType.java b/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingFolderType.java index c2c2c03a6..e9839f21b 100644 --- a/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingFolderType.java +++ b/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingFolderType.java @@ -27,7 +27,7 @@ public WNPRC_PurchasingFolderType(Module module) private static @Nullable Portal.WebPart createWebPart(String name) { - WebPartFactory factory = Portal.getPortalPartCaseInsensitive(name); + WebPartFactory factory = Portal.getPortalPart(name); return null != factory ? factory.createWebPart(WebPartFactory.LOCATION_BODY) : null; } diff --git a/WNPRC_Virology/src/org/labkey/wnprc_virology/WNPRC_VirologyController.java b/WNPRC_Virology/src/org/labkey/wnprc_virology/WNPRC_VirologyController.java index 2b5385a60..875c7cad9 100644 --- a/WNPRC_Virology/src/org/labkey/wnprc_virology/WNPRC_VirologyController.java +++ b/WNPRC_Virology/src/org/labkey/wnprc_virology/WNPRC_VirologyController.java @@ -2,8 +2,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.json.JSONObject; import org.json.JSONArray; +import org.json.JSONObject; import org.labkey.api.action.ApiResponse; import org.labkey.api.action.ApiSimpleResponse; import org.labkey.api.action.MutatingApiAction; @@ -52,9 +52,10 @@ public class WNPRC_VirologyController extends SpringActionController { public static final String CONFIGURE_VIROLOGY_FOLDER = "Configure WNPRC Virology Shared Data Folder"; - private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(WNPRC_VirologyController.class); public static final String NAME = "wnprc_virology"; - private static Logger _log = LogManager.getLogger(WNPRC_VirologyController.class); + + private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(WNPRC_VirologyController.class); + private static final Logger _log = LogManager.getLogger(WNPRC_VirologyController.class); private static final String _sourceDataTableName = "viral_load_data_filtered"; @@ -64,11 +65,12 @@ public WNPRC_VirologyController() } @RequiresPermission(ReadPermission.class) - public class BeginAction extends SimpleViewAction + public static class BeginAction extends SimpleViewAction { - public ModelAndView getView(Object o, BindException errors) throws Exception + @Override + public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/wnprc_virology/view/hello.jsp"); + return new JspView<>("/org/labkey/wnprc_virology/view/hello.jsp"); } @Override @@ -108,9 +110,9 @@ public void upsertAccounts(Container viralLoadContainer, Container currentContai List newList = new ArrayList<>(); List currentList = new ArrayList<>(); - for (int k = 0; k < accountNumbers.length; k ++) + for (int accountNumber : accountNumbers) { - newList.add(accountNumbers[k]); + newList.add(accountNumber); } SimpleQueryUpdater qu = new SimpleQueryUpdater(getUser(), viralLoadContainer, schemaName, queryName); @@ -120,32 +122,31 @@ public void upsertAccounts(Container viralLoadContainer, Container currentContai currentList.add(ja.getJSONObject(r)); } - if (newList.size() == 0) + if (newList.isEmpty()) { - for (int j = 0; j < currentList.size(); j++) + for (JSONObject jo : currentList) { - JSONObject jo = currentList.get(j); - Map mp = new HashMap<>(); + Map mp = new HashMap<>(); mp.put("folder_name", currentContainer.getName()); mp.put("account", jo.get("account")); mp.put("rowid", jo.get("rowid")); rowsToDelete.add(mp); } - } else if (ja.length() == 0) + } + else if (ja.isEmpty()) { - for (int i = 0; i < newList.size(); i++) + for (Integer integer : newList) { - Map mp = new HashMap<>(); + Map mp = new HashMap<>(); mp.put("folder_name", currentContainer.getName()); - mp.put("account", newList.get(i)); + mp.put("account", integer); rowsToInsert.add(mp); } - } else if (newList.size() > 0 && ja.length() > 0) + } + else if (!ja.isEmpty()) { - - for (int t = 0; t < currentList.size(); t++) + for (JSONObject jo : currentList) { - JSONObject jo = currentList.get(t); boolean neverFound = true; for (int h = 0; h < newList.size(); h++) { @@ -157,27 +158,25 @@ public void upsertAccounts(Container viralLoadContainer, Container currentContai } if (neverFound) { - Map mp = new HashMap<>(); + Map mp = new HashMap<>(); mp.put("folder_name", currentContainer.getName()); mp.put("account", jo.get("account")); mp.put("rowid", jo.get("rowid")); rowsToDelete.add(mp); } } - for (int g = 0; g < newList.size(); g++) + for (Integer integer : newList) { - Map mp = new HashMap<>(); + Map mp = new HashMap<>(); mp.put("folder_name", currentContainer.getName()); - mp.put("account", newList.get(g)); + mp.put("account", integer); rowsToInsert.add(mp); } - } if (!rowsToInsert.isEmpty()) qu.insert(rowsToInsert); if (!rowsToDelete.isEmpty()) qu.delete(rowsToDelete); - } /* An action to update accounts without folder setup */ @@ -276,15 +275,12 @@ public ApiResponse execute(FolderSetupForm folderSetupForm, BindException errors result.put("success", true); return new ApiSimpleResponse(result); } - - } // Intended to be called from test code @RequiresPermission(AdminPermission.class) public static class StartRSEHRJobAction extends MutatingApiAction { - @Override public Object execute(Object o, BindException errors) throws Exception { @@ -322,7 +318,6 @@ public Object execute(Object o, BindException errors) throws Exception QueryService.get().createLinkedSchema(getUser(), c, "wnprc_virology_linked", viralLoadContainer.getId(), "wnprc_virology", null, "grant_accounts, folders_accounts_mappings", null); return null; } - } // Only to be called from test code diff --git a/WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Controller.java b/WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Controller.java index ded89e3d1..5c086c6a7 100644 --- a/WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Controller.java +++ b/WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Controller.java @@ -36,11 +36,12 @@ public wnprc_r24Controller() } @RequiresPermission(ReadPermission.class) - public class BeginAction extends SimpleViewAction + public static class BeginAction extends SimpleViewAction { - public ModelAndView getView(Object o, BindException errors) throws Exception + @Override + public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/wnprc_r24/view/hello.jsp"); + return new JspView<>("/org/labkey/wnprc_r24/view/hello.jsp"); } @Override diff --git a/WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Controller.java b/WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Controller.java index d55dee8c6..659ba16f5 100644 --- a/WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Controller.java +++ b/WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Controller.java @@ -36,11 +36,12 @@ public wnprc_u24Controller() } @RequiresPermission(ReadPermission.class) - public class BeginAction extends SimpleViewAction + public static class BeginAction extends SimpleViewAction { - public ModelAndView getView(Object o, BindException errors) throws Exception + @Override + public ModelAndView getView(Object o, BindException errors) { - return new JspView("/org/labkey/wnprc_u24/view/hello.jsp"); + return new JspView<>("/org/labkey/wnprc_u24/view/hello.jsp"); } @Override