Updates from code inspection (#156)

Author: bbimber

LDK/api-src/org/labkey/api/ldk/notification/NotificationSection.java

@@ -25,7 +25,7 @@
  */
 public interface NotificationSection
 {
-    public String getMessage(Container c, User u);
+    String getMessage(Container c, User u);
 
-    public boolean isAvailable(Container c, User u);
+    boolean isAvailable(Container c, User u);
 }

LDK/resources/web/LDK/calendar/src/view/AbstractCalendar.js

@@ -523,7 +523,7 @@ Ext.define('Ext.calendar.view.AbstractCalendar', {
             this.doAddFx(this.getEventEls(rec.data[Ext.calendar.data.EventMappings.EventId.name]), {
                 scope: this
             });
-        };
+        }
     },
 
     doAddFx: function(els, o) {

LDK/resources/web/LDK/panel/TabbedReportPanel.js

@@ -1418,7 +1418,7 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
                     console.log('param is too long for URL: ' + i + '/' + filters[i].length);
                 }
                 else if (['removable', 'nonRemovable'].indexOf(i) !== -1){
-                    continue;
+
                 }
                 else {
                     token.push(i + ':' + filters[i]);

LDK/src/org/labkey/ldk/LDKController.java

@@ -104,7 +104,7 @@
 public class LDKController extends SpringActionController
 {
     private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(LDKController.class);
-    private static Logger _log = LogManager.getLogger(LDKController.class);
+    private static final Logger _log = LogManager.getLogger(LDKController.class);
 
     public LDKController()
     {
@@ -445,11 +445,10 @@ public ModelAndView getView(Object form, BindException errors) throws Exception
             LDKServiceImpl service = (LDKServiceImpl)LDKServiceImpl.get();
             List<String> messages = service.validateContainerScopedTables(false);
 
-            StringBuilder sb = new StringBuilder();
-            sb.append("This page is designed to inspect all registered container scoped tables and report any tables with duplicate keys in the same container.  This should be enforced by the user schema; however, direct DB inserts will bypass this check.<p>");
-            sb.append(StringUtils.join(messages, "<br>"));
+            String sb = "This page is designed to inspect all registered container scoped tables and report any tables with duplicate keys in the same container.  This should be enforced by the user schema; however, direct DB inserts will bypass this check.<p>" +
+                    StringUtils.join(messages, "<br>");
 
-            return new HtmlView(sb.toString());
+            return new HtmlView(sb);
         }
 
         @Override
@@ -914,11 +913,10 @@ public ModelAndView getConfirmView(MoveWorkbookForm form, BindException errors)
                 return new SimpleErrorView(errors);
             }
 
-            StringBuilder sb = new StringBuilder();
-            sb.append("This will move this workbook to the selected folder, renaming this workbook to match the series in that container.  Note: there are many reasons this can be problematic, so please do this with great care<p>");
-            sb.append("<input name=\"targetContainer\" type=\"text\"></input>");
+            String sb = "This will move this workbook to the selected folder, renaming this workbook to match the series in that container.  Note: there are many reasons this can be problematic, so please do this with great care<p>" +
+                    "<input name=\"targetContainer\" type=\"text\"></input>";
 
-            return new HtmlView(sb.toString());
+            return new HtmlView(sb);
         }
 
         @Override

LDK/src/org/labkey/ldk/LDKServiceImpl.java

@@ -57,10 +57,10 @@
 public class LDKServiceImpl extends LDKService
 {
     private static final Logger _log = LogManager.getLogger(LDKServiceImpl.class);
-    private Set<NotificationSection> _summaryNotificationSections = new HashSet<>();
-    private List<List<String>> _containerScopedTables = new ArrayList<>();
+    private final Set<NotificationSection> _summaryNotificationSections = new HashSet<>();
+    private final List<List<String>> _containerScopedTables = new ArrayList<>();
     private Boolean _isNaturalizeInstalled = null;
-    private Map<String, Map<String, List<ButtonConfigFactory>>> _queryButtons = new CaseInsensitiveHashMap<Map<String, List<ButtonConfigFactory>>>();
+    private final Map<String, Map<String, List<ButtonConfigFactory>>> _queryButtons = new CaseInsensitiveHashMap<Map<String, List<ButtonConfigFactory>>>();
     private static final String BACKGROUND_USER_PROPNAME = "BackgroundAdminUser";
 
     public LDKServiceImpl()

LDK/src/org/labkey/ldk/notification/NotificationServiceImpl.java

@@ -88,8 +88,8 @@ public class NotificationServiceImpl extends NotificationService
     private static final String RETURN_EMAIL = "returnEmail";
     private static final String USER_PROP = "user";
 
-    private List<Notification> _notifications = new ArrayList<>();
-    private Map<Notification, Trigger> _triggerMap = new HashMap<>();
+    private final List<Notification> _notifications = new ArrayList<>();
+    private final Map<Notification, Trigger> _triggerMap = new HashMap<>();
 
     public static NotificationServiceImpl get()
     {
@@ -292,9 +292,8 @@ public JSONObject getJson(Notification n, Container c, User u)
         List<UserPrincipal> ups = new ArrayList<>();
         for (UserPrincipal up : NotificationServiceImpl.get().getRecipients(n, c))
         {
-            if (up instanceof Group)
+            if (up instanceof Group g)
             {
-                Group g = (Group)up;
                 Set<UserPrincipal> members = SecurityManager.getAllGroupMembers(g, MemberType.ALL_GROUPS_AND_USERS);
                 if (members.contains(u))
                     ups.add(up);
@@ -376,7 +375,7 @@ public List<Address> getEmailsForPrincipal(UserPrincipal user) throws ValidEmail
     {
         if (user instanceof User)
         {
-            if (!((User) user).isActive())
+            if (!user.isActive())
             {
                 //_log.error("an inactive user is a notification recipient: " + user.getName());
                 return Collections.emptyList();
@@ -461,7 +460,7 @@ public User getUser(Notification n, Container c)
     public Set<UserPrincipal> getRecipients(Notification n, Container c)
     {
         final Set<UserPrincipal> recipients = new HashSet<>();
-        TableInfo t = LDKSchema.getInstance().getTable(LDKSchema.TABLE_NOTIFICATION_RECIPIENTS);
+        TableInfo t = LDKSchema.getTable(LDKSchema.TABLE_NOTIFICATION_RECIPIENTS);
         SimpleFilter filter = new SimpleFilter(FieldKey.fromString("notificationtype"), n.getName(), CompareType.EQUAL);
         filter.addCondition(FieldKey.fromString("container"), c.getId(), CompareType.EQUAL);
         TableSelector ts = new TableSelector(t, Collections.singleton("recipient"), filter, null);

LDK/src/org/labkey/ldk/query/BuiltInColumnsCustomizer.java

@@ -119,7 +119,7 @@ public void customizeColumn(MutableColumnInfo col)
             }
         };
 
-        private Class dataType;
+        private final Class dataType;
 
         COL_ENUM(Class dataType){
             this.dataType = dataType;

LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java

@@ -212,7 +212,7 @@ public static void applyNaturalSort(AbstractTableInfo ti, String colName)
         sortCol.setLabel(col.getLabel() + " - Sort Field");
         ti.addColumn(sortCol);
 
-        col.setSortFieldKeys(Arrays.asList(sortCol.getFieldKey()));
+        col.setSortFieldKeys(Collections.singletonList(sortCol.getFieldKey()));
     }
 
     public static void appendCalculatedDateColumns(AbstractTableInfo ti, @Nullable String dateColName, @Nullable String enddateColName)
@@ -373,9 +373,8 @@ private static boolean configureMoreActionsBtn(TableInfo ti, List<ButtonConfigFa
         {
             for (ButtonConfig btn : existingBtns)
             {
-                if (btn instanceof UserDefinedButtonConfig)
+                if (btn instanceof UserDefinedButtonConfig ub)
                 {
-                    UserDefinedButtonConfig ub = (UserDefinedButtonConfig)btn;
                     if (MORE_ACTIONS.equals(ub.getText()))
                     {
                         moreActionsBtn = ub;
@@ -432,18 +431,18 @@ private static boolean configureMoreActionsBtn(TableInfo ti, List<ButtonConfigFa
 
     public static class Settings
     {
-        private Map<PROPERIES, Object> propertyMap;
+        private final Map<PROPERIES, Object> propertyMap;
 
-        public static enum PROPERIES
+        public enum PROPERIES
         {
             disableAllEditUI(Boolean.class, false),
             setEditLinkOverrides(Boolean.class, true),
             auditMode(String.class, AuditBehaviorType.DETAILED.name()),
             disableFacetingForNumericCols(Boolean.class, true),
             overrideDetailsUrl(Boolean.class, true);
 
-            private Class _clazz;
-            private Object _defaultVal;
+            private final Class _clazz;
+            private final Object _defaultVal;
 
             PROPERIES(Class clazz, Object defaultVal)
             {

LDK/src/org/labkey/ldk/query/LookupSetTable.java

@@ -226,7 +226,7 @@ private void insertDataAndValidate(String tableName, UserSchema us, String table
             }
 
             //Test duplicate keys, expect failure
-            ti.getUpdateService().insertRows(getUser(), project, Arrays.asList(row1), errors1, null, null);
+            ti.getUpdateService().insertRows(getUser(), project, List.of(row1), errors1, null, null);
             if (errors1.hasErrors())
             {
                 String msg = errors1.getRowErrors().get(0).getMessage();
@@ -251,7 +251,7 @@ public void insertFailedValidationTest() throws Exception
 
             // Expect failure
             BatchValidationException errors1 = new BatchValidationException();
-            us.getTable(TABLE1).getUpdateService().insertRows(getUser(), project, Arrays.asList(row1), errors1, null, null);
+            us.getTable(TABLE1).getUpdateService().insertRows(getUser(), project, List.of(row1), errors1, null, null);
             if (errors1.hasErrors())
             {
                 String msg = errors1.getRowErrors().get(0).getMessage();
@@ -265,7 +265,7 @@ public void insertFailedValidationTest() throws Exception
             //this will pass
             row1.put("vaLuE", "CBA");
             errors1 = new BatchValidationException();
-            us.getTable(TABLE1).getUpdateService().insertRows(getUser(), project, Arrays.asList(row1), errors1, null, null);
+            us.getTable(TABLE1).getUpdateService().insertRows(getUser(), project, List.of(row1), errors1, null, null);
             if (errors1.hasErrors())
             {
                 throw errors1;
@@ -281,7 +281,7 @@ public void insertFailedValidationTest() throws Exception
 
             try
             {
-                us.getTable(TABLE1).getUpdateService().updateRows(getUser(), project, Arrays.asList(row1), oldKeys, null, null);
+                us.getTable(TABLE1).getUpdateService().updateRows(getUser(), project, List.of(row1), oldKeys, null, null);
 
                 //Ben's change
                 throw new ValidationException("Expected update to fail because of row validators");

LDK/src/org/labkey/ldk/query/LookupValidationHelper.java

@@ -38,12 +38,12 @@
 public class LookupValidationHelper
 {
     private Container _container;
-    private User _user;
-    private TableInfo _table;
+    private final User _user;
+    private final TableInfo _table;
     private static final Logger _log = LogManager.getLogger(LookupValidationHelper.class);
 
-    private Map<String, UserSchema> _userSchemaMap = new HashMap<String, UserSchema>();
-    private Map<String, Map<String, String>> _allowableValueMap = new HashMap<String, Map<String, String>>();
+    private final Map<String, UserSchema> _userSchemaMap = new HashMap<String, UserSchema>();
+    private final Map<String, Map<String, String>> _allowableValueMap = new HashMap<String, Map<String, String>>();
 
     private LookupValidationHelper(String containerId, int userId, String schemaName, String queryName)
     {