Skip to content

Eliminate some warnings #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Jul 9, 2025
Merged

Eliminate some warnings #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CageUI/src/org/labkey/cageui/CageUIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ public CageUIController()
}

@RequiresPermission(ReadPermission.class)
public class BeginAction extends SimpleViewAction
public static class BeginAction extends SimpleViewAction<Object>
{
@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) { }
}

}
5 changes: 1 addition & 4 deletions CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<CageUIUserSchema>
{
public LayoutHistoryTable(CageUIUserSchema schema, TableInfo table, ContainerFilter cf)
Expand All @@ -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<? extends Permission> perm)
public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
{
boolean hasPermission = super.hasPermission(user, perm);
boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class;
Expand Down
3 changes: 1 addition & 2 deletions CageUI/src/org/labkey/cageui/query/RackTypesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<? extends Permission> perm)
public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
{
boolean hasPermission = super.hasPermission(user, perm);
boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class;
Expand Down
9 changes: 1 addition & 8 deletions CageUI/src/org/labkey/cageui/query/RacksTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<? extends Permission> perm)
public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
{
boolean hasPermission = super.hasPermission(user, perm);
boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class;
Expand Down
7 changes: 4 additions & 3 deletions ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ public ETLChemistryAnalyzerController()
}

@RequiresPermission(ReadPermission.class)
public class BeginAction extends SimpleViewAction
public static class BeginAction extends SimpleViewAction<Object>
{
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
Expand Down
38 changes: 23 additions & 15 deletions WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public WNPRC_PurchasingController()
@NotNull
private List<User> getFolderAdmins()
{
List<RoleAssignment> folderAdminGroups = getContainer().getPolicy().getAssignments().stream().filter(roleAssignment -> roleAssignment.getRole().getName().equals(FOLDER_ADMIN_ROLE)).collect(Collectors.toList());
List<RoleAssignment> folderAdminGroups = getContainer().getPolicy().getAssignments().stream().filter(roleAssignment -> roleAssignment.getRole().getName().equals(FOLDER_ADMIN_ROLE)).toList();
List<User> folderAdmins = new ArrayList<>();
for (RoleAssignment folderAdmin : folderAdminGroups)
{
Expand All @@ -128,50 +128,57 @@ private List<User> getFolderAdmins()
}

@RequiresPermission(InsertPermission.class)
public class RequesterAction extends SimpleViewAction
public static class RequesterAction extends SimpleViewAction<Object>
{
@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<Object>
{
@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<Object>
{
@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<Object>
{
@Override
public ModelAndView getView(Object o, BindException errors)
{
ModuleHtmlView view = ModuleHtmlView.get(ModuleLoader.getInstance().getModule("WNPRC_Purchasing"), ModuleHtmlView.getGeneratedViewPath("RequestEntry"));
Expand All @@ -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<Object>
{
@Override
public Object execute(Object o, BindException errors)
Expand Down Expand Up @@ -249,7 +257,7 @@ public Object execute(RequestForm requestForm, BindException errors) throws Exce

List<ValidationException> validationExceptions = WNPRC_PurchasingManager.get().submitRequestForm(getUser(), getContainer(), requestForm);

if (validationExceptions.size() > 0)
if (!validationExceptions.isEmpty())
{
throw new BatchValidationException(validationExceptions, null);
}
Expand Down Expand Up @@ -287,7 +295,7 @@ private void sendRequestChangeEmailNotification(String oldStatus, EmailTemplateF
List<User> usersWithInsertPerm = SecurityManager.getUsersWithPermissions(getContainer(), Collections.singleton(InsertPermission.class));

//get the lab end user who originated the request
List <User> labEndUsers = usersWithInsertPerm.stream().filter(u -> u.getUserId() == emailTemplateForm.getRequester().getUserId()).collect(Collectors.toList());
List <User> 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
Expand Down Expand Up @@ -351,16 +359,16 @@ private void sendRequestChangeEmailNotification(String oldStatus, EmailTemplateF
List<LineItem> removed = oldLineItems.stream().filter(o1 -> updatedLineItems.stream().noneMatch(o2 -> o2.getRowId() == o1.getRowId())).collect(Collectors.toList());

List<LineItem> 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());
Expand Down Expand Up @@ -604,7 +612,7 @@ public void setUnitCost(double unitCost)
}
}

public class EmailTemplateForm
public static class EmailTemplateForm
{
Integer _rowId;
String _vendor;
Expand Down
2 changes: 1 addition & 1 deletion WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingFolderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading