Skip to content

Commit 3468208

Browse files
labkey-adamlabkey-adam
committed
Eliminate some warnings
1 parent 6cf967a commit 3468208

10 files changed

Lines changed: 68 additions & 72 deletions

File tree

‎CageUI/src/org/labkey/cageui/CageUIController.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@ public CageUIController()
3838
}
3939

4040
@RequiresPermission(ReadPermission.class)
41-
public class BeginAction extends SimpleViewAction
41+
public static class BeginAction extends SimpleViewAction<Object>
4242
{
43+
@Override
4344
public ModelAndView getView(Object o, BindException errors)
4445
{
45-
return new JspView("/org/labkey/cageui/view/hello.jsp");
46+
return new JspView<>("/org/labkey/cageui/view/hello.jsp");
4647
}
4748

49+
@Override
4850
public void addNavTrail(NavTree root) { }
4951
}
50-
5152
}

‎CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission;
4242

4343
import java.sql.SQLException;
44-
import java.util.ArrayList;
4544
import java.util.List;
4645
import java.util.Map;
4746

48-
import static org.labkey.api.query.QueryUpdateService.ConfigParameters.PreferPKOverObjectUriAsKey;
49-
5047
public class LayoutHistoryTable extends SimpleUserSchema.SimpleTable<CageUIUserSchema>
5148
{
5249
public LayoutHistoryTable(CageUIUserSchema schema, TableInfo table, ContainerFilter cf)
@@ -69,7 +66,7 @@ public UpdateService(SimpleUserSchema.SimpleTable ti)
6966

7067
// This checks permission before any data modification occurs
7168
@Override
72-
public boolean hasPermission(@NotNull UserPrincipal user, Class<? extends Permission> perm)
69+
public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
7370
{
7471
boolean hasPermission = super.hasPermission(user, perm);
7572
boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class;

‎CageUI/src/org/labkey/cageui/query/RackTypesTable.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission;
4040

4141
import java.sql.SQLException;
42-
import java.util.ArrayList;
4342
import java.util.List;
4443
import java.util.Map;
4544

@@ -65,7 +64,7 @@ public UpdateService(SimpleUserSchema.SimpleTable ti)
6564

6665
// This checks permission before any data modification occurs
6766
@Override
68-
public boolean hasPermission(@NotNull UserPrincipal user, Class<? extends Permission> perm)
67+
public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
6968
{
7069
boolean hasPermission = super.hasPermission(user, perm);
7170
boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class;

‎CageUI/src/org/labkey/cageui/query/RacksTable.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,19 @@
2626
import org.labkey.api.query.BatchValidationException;
2727
import org.labkey.api.query.DuplicateKeyException;
2828
import org.labkey.api.query.InvalidKeyException;
29-
import org.labkey.api.query.QueryService;
3029
import org.labkey.api.query.QueryUpdateService;
3130
import org.labkey.api.query.QueryUpdateServiceException;
32-
import org.labkey.api.query.RuntimeValidationException;
3331
import org.labkey.api.query.SimpleQueryUpdateService;
3432
import org.labkey.api.query.SimpleUserSchema;
35-
import org.labkey.api.query.ValidationException;
3633
import org.labkey.api.security.User;
3734
import org.labkey.api.security.UserPrincipal;
3835
import org.labkey.api.security.permissions.DeletePermission;
3936
import org.labkey.api.security.permissions.InsertPermission;
4037
import org.labkey.api.security.permissions.Permission;
4138
import org.labkey.api.security.permissions.UpdatePermission;
42-
import org.labkey.api.view.UnauthorizedException;
43-
import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
44-
import org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission;
4539
import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission;
4640

4741
import java.sql.SQLException;
48-
import java.util.ArrayList;
4942
import java.util.List;
5043
import java.util.Map;
5144

@@ -71,7 +64,7 @@ public UpdateService(SimpleUserSchema.SimpleTable ti)
7164

7265
// This checks permission before any data modification occurs
7366
@Override
74-
public boolean hasPermission(@NotNull UserPrincipal user, Class<? extends Permission> perm)
67+
public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? extends Permission> perm)
7568
{
7669
boolean hasPermission = super.hasPermission(user, perm);
7770
boolean isEditPerm = perm == InsertPermission.class || perm == UpdatePermission.class || perm == DeletePermission.class;

‎ETLChemistryAnalyzer/src/org/labkey/ETLChemistryAnalyzer/ETLChemistryAnalyzerController.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ public ETLChemistryAnalyzerController()
3636
}
3737

3838
@RequiresPermission(ReadPermission.class)
39-
public class BeginAction extends SimpleViewAction
39+
public static class BeginAction extends SimpleViewAction<Object>
4040
{
41-
public ModelAndView getView(Object o, BindException errors) throws Exception
41+
@Override
42+
public ModelAndView getView(Object o, BindException errors)
4243
{
43-
return new JspView("/org/labkey/ETLChemistryAnalyzer/view/hello.jsp");
44+
return new JspView<>("/org/labkey/ETLChemistryAnalyzer/view/hello.jsp");
4445
}
4546

4647
@Override

‎WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public WNPRC_PurchasingController()
105105
@NotNull
106106
private List<User> getFolderAdmins()
107107
{
108-
List<RoleAssignment> folderAdminGroups = getContainer().getPolicy().getAssignments().stream().filter(roleAssignment -> roleAssignment.getRole().getName().equals(FOLDER_ADMIN_ROLE)).collect(Collectors.toList());
108+
List<RoleAssignment> folderAdminGroups = getContainer().getPolicy().getAssignments().stream().filter(roleAssignment -> roleAssignment.getRole().getName().equals(FOLDER_ADMIN_ROLE)).toList();
109109
List<User> folderAdmins = new ArrayList<>();
110110
for (RoleAssignment folderAdmin : folderAdminGroups)
111111
{
@@ -128,50 +128,57 @@ private List<User> getFolderAdmins()
128128
}
129129

130130
@RequiresPermission(InsertPermission.class)
131-
public class RequesterAction extends SimpleViewAction
131+
public static class RequesterAction extends SimpleViewAction<Object>
132132
{
133+
@Override
133134
public ModelAndView getView(Object o, BindException errors)
134135
{
135-
WebPartFactory factory = Portal.getPortalPartCaseInsensitive("WNPRC Purchasing Requester");
136+
WebPartFactory factory = Portal.getPortalPart("WNPRC Purchasing Requester");
136137
Portal.WebPart part = factory.createWebPart();
137138
getPageConfig().setTitle("Purchasing Requester");
138139
return Portal.getWebPartViewSafe(factory, getViewContext(), part);
139140
}
140141

142+
@Override
141143
public void addNavTrail(NavTree root) { }
142144
}
143145

144146
@RequiresPermission(AdminPermission.class)
145-
public class PurchaseAdminAction extends SimpleViewAction
147+
public static class PurchaseAdminAction extends SimpleViewAction<Object>
146148
{
149+
@Override
147150
public ModelAndView getView(Object o, BindException errors)
148151
{
149-
WebPartFactory factory = Portal.getPortalPartCaseInsensitive("WNPRC Purchasing Admin");
152+
WebPartFactory factory = Portal.getPortalPart("WNPRC Purchasing Admin");
150153
getPageConfig().setTitle("Purchasing Admin");
151154
Portal.WebPart part = factory.createWebPart();
152155
return Portal.getWebPartViewSafe(factory, getViewContext(), part);
153156
}
154157

158+
@Override
155159
public void addNavTrail(NavTree root) { }
156160
}
157161

158162
@RequiresPermission(UpdatePermission.class)
159-
public class PurchaseReceiverAction extends SimpleViewAction
163+
public static class PurchaseReceiverAction extends SimpleViewAction<Object>
160164
{
165+
@Override
161166
public ModelAndView getView(Object o, BindException errors)
162167
{
163-
WebPartFactory factory = Portal.getPortalPartCaseInsensitive("WNPRC Purchasing Receiver");
168+
WebPartFactory factory = Portal.getPortalPart("WNPRC Purchasing Receiver");
164169
getPageConfig().setTitle("Purchasing Receiver");
165170
Portal.WebPart part = factory.createWebPart();
166171
return Portal.getWebPartViewSafe(factory, getViewContext(), part);
167172
}
168173

174+
@Override
169175
public void addNavTrail(NavTree root) { }
170176
}
171177

172178
@RequiresPermission(ReadPermission.class)
173-
public class PurchasingRequestAction extends SimpleViewAction
179+
public static class PurchasingRequestAction extends SimpleViewAction<Object>
174180
{
181+
@Override
175182
public ModelAndView getView(Object o, BindException errors)
176183
{
177184
ModuleHtmlView view = ModuleHtmlView.get(ModuleLoader.getInstance().getModule("WNPRC_Purchasing"), ModuleHtmlView.getGeneratedViewPath("RequestEntry"));
@@ -180,11 +187,12 @@ public ModelAndView getView(Object o, BindException errors)
180187
return view;
181188
}
182189

190+
@Override
183191
public void addNavTrail(NavTree root) { }
184192
}
185193

186194
@RequiresPermission(InsertPermission.class)
187-
public class GetFolderAdminsAction extends ReadOnlyApiAction
195+
public class GetFolderAdminsAction extends ReadOnlyApiAction<Object>
188196
{
189197
@Override
190198
public Object execute(Object o, BindException errors)
@@ -249,7 +257,7 @@ public Object execute(RequestForm requestForm, BindException errors) throws Exce
249257

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

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

289297
//get the lab end user who originated the request
290-
List <User> labEndUsers = usersWithInsertPerm.stream().filter(u -> u.getUserId() == emailTemplateForm.getRequester().getUserId()).collect(Collectors.toList());
298+
List <User> labEndUsers = usersWithInsertPerm.stream().filter(u -> u.getUserId() == emailTemplateForm.getRequester().getUserId()).toList();
291299
User endUser = labEndUsers.size() == 1 ? labEndUsers.get(0) : null;
292300

293301
//request status change email notification
@@ -351,16 +359,16 @@ private void sendRequestChangeEmailNotification(String oldStatus, EmailTemplateF
351359
List<LineItem> removed = oldLineItems.stream().filter(o1 -> updatedLineItems.stream().noneMatch(o2 -> o2.getRowId() == o1.getRowId())).collect(Collectors.toList());
352360

353361
List<LineItem> quantityChange = updatedLineItems.stream().filter(o1 -> oldLineItems.stream().noneMatch(o2 -> o1.getRowId() == o2.getRowId()
354-
&& o2.getQuantity() == o1.getQuantity())).collect(Collectors.toList());
362+
&& o2.getQuantity() == o1.getQuantity())).toList();
355363

356364
boolean fullQuantityReceived = updatedLineItems.stream().filter(o2 -> o2.getQuantityReceived() >= o2.getQuantity()).count() == updatedLineItems.size();
357365

358-
if (removed.size() > 0 || quantityChange.size() > 0 || fullQuantityReceived)
366+
if (!removed.isEmpty() || !quantityChange.isEmpty() || fullQuantityReceived)
359367
{
360368
LineItemChangeEmailTemplate lineItemChangeEmailTemplate = EmailTemplateService.get().getEmailTemplate(LineItemChangeEmailTemplate.class);
361369
lineItemChangeEmailTemplate.setUpdatedLineItemsList(updatedLineItems);
362370
lineItemChangeEmailTemplate.setOldLineItemsList(oldLineItems);
363-
lineItemChangeEmailTemplate.setDeletedLineItemFlag(removed.size() > 0);
371+
lineItemChangeEmailTemplate.setDeletedLineItemFlag(!removed.isEmpty());
364372
lineItemChangeEmailTemplate.setFullQuantityReceivedFlag(fullQuantityReceived);
365373
lineItemChangeEmailTemplate.setNotificationBean(emailTemplateForm);
366374
String emailSubject = lineItemChangeEmailTemplate.renderSubject(getContainer());
@@ -604,7 +612,7 @@ public void setUnitCost(double unitCost)
604612
}
605613
}
606614

607-
public class EmailTemplateForm
615+
public static class EmailTemplateForm
608616
{
609617
Integer _rowId;
610618
String _vendor;

‎WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingFolderType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public WNPRC_PurchasingFolderType(Module module)
2727

2828
private static @Nullable Portal.WebPart createWebPart(String name)
2929
{
30-
WebPartFactory factory = Portal.getPortalPartCaseInsensitive(name);
30+
WebPartFactory factory = Portal.getPortalPart(name);
3131
return null != factory ? factory.createWebPart(WebPartFactory.LOCATION_BODY) : null;
3232
}
3333

0 commit comments

Comments
 (0)