Merge branch 'develop' into fb_packageUpdateMay11

Author: cnathe

announcements/src/org/labkey/announcements/NotificationSettingsImporterFactory.java

@@ -61,7 +61,7 @@ public void process(PipelineJob job, FolderImportContext ctx, VirtualFile root)
             {
                 if (null != job)
                     job.setStatus("IMPORT " + getDescription());
-                ctx.getLogger().info("Loading " + getDescription());
+                ctx.getLogger().info("Loading {}", getDescription());
                 NotificationsType notifications = ctx.getXml().getNotifications();
                 if (notifications.isSetMessagesDefault())
                 {
@@ -70,7 +70,7 @@ public void process(PipelineJob job, FolderImportContext ctx, VirtualFile root)
                     if (messagesOption != null)
                         AnnouncementManager.saveDefaultEmailOption(ctx.getContainer(), messagesDefault);
                     else
-                        ctx.getLogger().error("Unable to find default messages email option for id " + messagesDefault);
+                        ctx.getLogger().error("Unable to find default messages email option for id {}", messagesDefault);
                 }
                 if (notifications.isSetFilesDefault())
                 {
@@ -79,10 +79,10 @@ public void process(PipelineJob job, FolderImportContext ctx, VirtualFile root)
                     if (filesOption != null)
                         EmailService.get().setDefaultEmailPref(ctx.getContainer(), new FileContentDefaultEmailPref(), String.valueOf(filesDefault));
                     else
-                        ctx.getLogger().error("Unable to find default files email option for id " + filesDefault);
+                        ctx.getLogger().error("Unable to find default files email option for id {}", filesDefault);
 
                 }
-                ctx.getLogger().info("Done importing " + getDescription());
+                ctx.getLogger().info("Done importing {}", getDescription());
             }
         }
 

announcements/src/org/labkey/announcements/RSSServiceImpl.java

@@ -88,7 +88,7 @@ public void aggregateFeeds(List<RSSFeed> feeds, User user, Writer writer)
             }
             catch (IOException e)
             {
-                LogManager.getLogger(RSSService.class).error("Invalid RSS Feed: " + e.getMessage());
+                LogManager.getLogger(RSSService.class).error("Invalid RSS Feed: {}", e.getMessage());
             }
 
             if (null != reader)
@@ -102,7 +102,7 @@ public void aggregateFeeds(List<RSSFeed> feeds, User user, Writer writer)
                 }
                 catch (FeedException fe)
                 {
-                    LogManager.getLogger(RSSService.class).error("Invalid Feed (FeedException): " + _feed.getFeedURL());
+                    LogManager.getLogger(RSSService.class).error("Invalid Feed (FeedException): {}", _feed.getFeedURL());
                 }
             }
         }

announcements/src/org/labkey/announcements/SendMessageAction.java

@@ -16,7 +16,6 @@
 
 package org.labkey.announcements;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -141,7 +140,7 @@ private Address getEmailTo(String email) throws IllegalArgumentException
             // filter out disabled users or users who have never logged in : Issue #33255
             if (!user.isActive() || user.isFirstLogin())
             {
-                _log.warn("The user: " + user.getName() + " is either disabled or has never logged in and has been omitted.");
+                _log.warn("The user: {} is either disabled or has never logged in and has been omitted.", user.getName());
                 return null;
             }
 

announcements/src/org/labkey/announcements/model/AnnouncementManager.java

@@ -383,7 +383,7 @@ private static void notifyModerators(Container c, User user, AnnouncementModel a
 
         if (toList.isEmpty())
         {
-            LOG.warn("New " + name.toLowerCase() + " requires moderator review, but no moderators are subscribed to receive 'Individual' notifications in this folder: " + c.getPath());
+            LOG.warn("New {} requires moderator review, but no moderators are subscribed to receive 'Individual' notifications in this folder: {}", name.toLowerCase(), c.getPath());
         }
         else
         {

announcements/src/org/labkey/announcements/query/ForumSubscriptionTable.java

@@ -40,7 +40,6 @@
 import org.labkey.api.security.UserManager;
 import org.labkey.api.security.UserPrincipal;
 import org.labkey.api.security.permissions.Permission;
-import org.labkey.api.security.permissions.ReadPermission;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -92,22 +91,6 @@ public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class<? exten
         return hasPermission(user, perm, getContainer());
     }
 
-    @Override
-    public boolean hasPermission(UserPrincipal user, Class<? extends Permission> perm, Container container)
-    {
-        // Guests can't subscribe to anything, or edit anyone else's subscriptions, but they can read the table
-        // It'll have no rows for them
-        if (user.isGuest() && !ReadPermission.class.equals(perm))
-        {
-            return false;
-        }
-
-        // For authenticated users, if they have read access, that's enough to edit their own subscription level
-        // The QueryUpdateService implementation will make sure they have permission to insert/update/delete at the row
-        // level.
-        return container.hasPermission(user, ReadPermission.class);
-    }
-
     @Override
     public QueryUpdateService getUpdateService()
     {

api/src/jakarta/servlet/jsp/JspWriter.java

@@ -187,7 +187,7 @@ protected JspWriter(int bufferSize, boolean autoFlush) {
      * @throws NullPointerException If <code>s</code> is <code>null</code>
      * @throws IOException          If an error occurred while writing
      */
-    public abstract void print(char s[]) throws IOException;
+    public abstract void print(char[] s) throws IOException;
 
     /**
      * Print a string. If the argument is <code>null</code> then the string <code>"null"</code> is printed. Otherwise,
@@ -293,7 +293,7 @@ protected JspWriter(int bufferSize, boolean autoFlush) {
      *
      * @throws IOException If an error occurred while writing
      */
-    public abstract void println(char x[]) throws IOException;
+    public abstract void println(char[] x) throws IOException;
 
     /**
      * Print a String and then terminate the line. This method behaves as though it invokes

api/src/org/labkey/api/action/ApiQueryResponse.java

@@ -409,7 +409,7 @@ protected Map<String, Object> getMetaData()
         //include an id property set to the pk column name if there is one (and only one)
         List<ColumnInfo> pkCols = _tinfo.getPkColumns();
         if (1 == pkCols.size())
-            metaData.put("id", pkCols.get(0).getName());
+            metaData.put("id", pkCols.getFirst().getName());
 
         metaData.put("fields", fields);
 

api/src/org/labkey/api/action/BaseApiAction.java

@@ -19,12 +19,12 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
+import org.jetbrains.annotations.NotNull;
 import org.labkey.api.miniprofiler.MiniProfiler;
 import org.labkey.api.miniprofiler.Timing;
 import org.labkey.api.query.BatchValidationException;
@@ -583,7 +583,7 @@ else if (value instanceof JSONObject)
     }
 
     @Override
-    public final void validate(Object form, Errors errors)
+    public final void validate(@NotNull Object form, @NotNull Errors errors)
     {
         try (Timing ignored = MiniProfiler.step("validate"))
         {

api/src/org/labkey/api/action/BaseViewAction.java

@@ -509,7 +509,7 @@ else if (!value.getClass().isArray())
     }
 
     @Override
-    public boolean supports(Class clazz)
+    public boolean supports(@NotNull Class clazz)
     {
         return getCommandClass().isAssignableFrom(clazz);
     }
@@ -559,7 +559,7 @@ public BeanUtilsPropertyBindingResult(Object target, String objectName)
         }
 
         @Override
-        protected BeanWrapper createBeanWrapper()
+        protected @NotNull BeanWrapper createBeanWrapper()
         {
             return new BeanUtilsWrapperImpl((DynaBean)getTarget());
         }
@@ -583,7 +583,7 @@ public BeanUtilsWrapperImpl(DynaBean target)
         }
 
         @Override
-        public Object getPropertyValue(String propertyName) throws BeansException
+        public Object getPropertyValue(@NotNull String propertyName) throws BeansException
         {
             try
             {
@@ -596,7 +596,7 @@ public Object getPropertyValue(String propertyName) throws BeansException
         }
 
         @Override
-        public void setPropertyValue(String propertyName, Object value) throws BeansException
+        public void setPropertyValue(@NotNull String propertyName, Object value) throws BeansException
         {
             try
             {
@@ -609,19 +609,19 @@ public void setPropertyValue(String propertyName, Object value) throws BeansExce
         }
 
         @Override
-        public boolean isReadableProperty(String propertyName)
+        public boolean isReadableProperty(@NotNull String propertyName)
         {
             return true;
         }
 
         @Override
-        public boolean isWritableProperty(String propertyName)
+        public boolean isWritableProperty(@NotNull String propertyName)
         {
             return true;
         }
 
         @Override
-        public TypeDescriptor getPropertyTypeDescriptor(String s) throws BeansException
+        public TypeDescriptor getPropertyTypeDescriptor(@NotNull String s) throws BeansException
         {
             return null;
         }
@@ -632,25 +632,25 @@ public void setWrappedInstance(Object obj)
         }
 
         @Override
-        public Object getWrappedInstance()
+        public @NotNull Object getWrappedInstance()
         {
             return object;
         }
 
         @Override
-        public Class<?> getWrappedClass()
+        public @NotNull Class<?> getWrappedClass()
         {
             return object.getClass();
         }
 
         @Override
-        public PropertyDescriptor[] getPropertyDescriptors()
+        public PropertyDescriptor @NotNull [] getPropertyDescriptors()
         {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public PropertyDescriptor getPropertyDescriptor(String propertyName) throws BeansException
+        public @NotNull PropertyDescriptor getPropertyDescriptor(@NotNull String propertyName) throws BeansException
         {
             throw new UnsupportedOperationException();
         }

api/src/org/labkey/api/action/ConfirmAction.java

@@ -129,7 +129,7 @@ public BindException bindParameters(PropertyValues m) throws Exception
     public abstract boolean handlePost(FORM form, BindException errors) throws Exception;
 
     @Override
-    public void validate(Object form, Errors errors)
+    public void validate(@NotNull Object form, @NotNull Errors errors)
     {
         validateCommand((FORM)form, errors);
     }