Fix assorted exceptions from bots/crawlers

announcements/src/org/labkey/announcements/AnnouncementsController.java

@@ -18,6 +18,7 @@
 
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.beanutils.ConversionException;
+import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.logging.log4j.LogManager;
@@ -145,6 +146,7 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -237,7 +239,7 @@ public static AnnouncementModel copyEditableProps(AnnouncementModel target, Anno
     // Anyone with read permission can attempt to view the list. AnnouncementWebPart will do further permission checking. For example,
     //   in a secure message board, those without Editor permissions will only see messages when they are on the member list
     @RequiresPermission(ReadPermission.class)
-    public class BeginAction extends SimpleViewAction
+    public class BeginAction extends SimpleViewAction<Object>
     {
         // Invoked via reflection
         @SuppressWarnings("UnusedDeclaration")
@@ -283,7 +285,7 @@ private static ActionURL getListURL(Container c)
 
 
     @RequiresPermission(ReadPermission.class)
-    public class ListAction extends SimpleViewAction
+    public class ListAction extends SimpleViewAction<Object>
     {
         @Override
         public ModelAndView getView(Object o, BindException errors)
@@ -313,7 +315,7 @@ public static ActionURL getAdminEmailURL(Container c, @Nullable URLHelper return
     }
 
     @RequiresPermission(DeletePermission.class)
-    public class DeleteThreadsAction extends FormHandlerAction
+    public class DeleteThreadsAction extends FormHandlerAction<Object>
     {
         @Override
         public void validateCommand(Object target, Errors errors)
@@ -766,7 +768,7 @@ private boolean hasEditorPerm(int groupId)
     @RequiresAnyOf({InsertMessagePermission.class, InsertPermission.class})
     public abstract class BaseInsertAction extends FormViewAction<AnnouncementForm>
     {
-        protected HttpView _attachmentErrorView;
+        protected HttpView<?> _attachmentErrorView;
 
         protected abstract ModelAndView getInsertUpdateView(AnnouncementForm announcementForm, boolean reshow, BindException errors);
 
@@ -956,7 +958,7 @@ public ModelAndView getInsertUpdateView(AnnouncementForm form, boolean reshow, B
             ThreadView threadView = new ThreadView(c, getActionURL(), parent, perm);
             threadView.setFrame(WebPartView.FrameType.DIV);
 
-            HttpView respondView = new RespondView(c, parent, form, form.getReturnUrlHelper(), errors, reshow, false);
+            HttpView<?> respondView = new RespondView(c, parent, form, form.getReturnUrlHelper(), errors, reshow, false);
 
             getPageConfig().setFocusId("body");
             _parent = parent;
@@ -1010,7 +1012,7 @@ private static SelectBuilder getRenderAsSelect(WikiRendererType currentRendererT
     }
 
     @RequiresPermission(InsertPermission.class)
-    public class CompleteUserAction extends ReadOnlyApiAction<AjaxCompletionForm>
+    public static class CompleteUserAction extends ReadOnlyApiAction<AjaxCompletionForm>
     {
         @Override
         public ApiResponse execute(AjaxCompletionForm form, BindException errors)
@@ -1093,12 +1095,7 @@ public BaseInsertView(String page, InsertBean bean, AnnouncementForm form, URLHe
 
             if (reshow)
             {
-                String rendererTypeName = (String) form.get("rendererType");
-
-                if (null == rendererTypeName)
-                    currentRendererType = DEFAULT_MESSAGE_RENDERER_TYPE;
-                else
-                    currentRendererType = WikiRendererType.valueOf(rendererTypeName);
+                currentRendererType = EnumUtils.getEnum(WikiRendererType.class, form.get("rendererType"), DEFAULT_MESSAGE_RENDERER_TYPE);
 
                 AnnouncementModel ann = form.getBean();
                 assignedTo = ann.getAssignedTo();
@@ -1289,10 +1286,7 @@ public boolean handlePost(AnnouncementForm form, BindException errors)
             // Needs to support non-ActionURL (e.g., an HTML page using the client API with embedded discussion webpart)
             // so we can't use getSuccessURL()
             URLHelper urlHelper = form.getReturnUrlHelper();
-            if (null != urlHelper)
-                throw new RedirectException(urlHelper);
-            else
-                throw new RedirectException(getThreadURL(getContainer(), oldAnn.getParent(), oldAnn.getRowId()));
+            throw new RedirectException(Objects.requireNonNullElseGet(urlHelper, () -> getThreadURL(getContainer(), oldAnn.getParent(), oldAnn.getRowId())));
         }
 
         @Override
@@ -1415,7 +1409,7 @@ public void addNavTrail(NavTree root)
 
 
     @RequiresPermission(ReadPermission.class)
-    public class RssAction extends SimpleViewAction
+    public class RssAction extends SimpleViewAction<Object>
     {
         // Invoked via reflection
         @SuppressWarnings("UnusedDeclaration")
@@ -1449,7 +1443,7 @@ public ModelAndView getView(Object o, BindException errors)
 
             ActionURL url = new ActionURL(ThreadAction.class, c).addParameter("rowId", null);
 
-            WebPartView v = new RssView(pair.first, url.getURIString());
+            WebPartView<?> v = new RssView(pair.first, url.getURIString());
 
             getResponse().setContentType("text/xml");
             getPageConfig().setTemplate(PageConfig.Template.None);
@@ -1526,7 +1520,7 @@ public ModelAndView getView(EmailOptionsForm form, boolean reshow, BindException
             form.setEmailOptionsOnPage(emailOption);
 
             setHelpTopic("createMessage");
-            JspView view = new JspView("/org/labkey/announcements/emailPreferences.jsp");
+            JspView<?> view = new JspView<>("/org/labkey/announcements/emailPreferences.jsp");
             view.setFrame(WebPartView.FrameType.NONE);
             EmailPreferencesPage page = (EmailPreferencesPage)view.getPage();
             view.setTitle("Email Preferences");
@@ -1599,7 +1593,7 @@ private static int getEmailOptionIncludingInherited(Container c, User user, Stri
     }
 
     @RequiresPermission(AdminPermission.class)
-    public class SetEmailDefaultAction extends MutatingApiAction<AbstractConfigTypeProvider.EmailConfigFormImpl>
+    public static class SetEmailDefaultAction extends MutatingApiAction<AbstractConfigTypeProvider.EmailConfigFormImpl>
     {
         @Override
         public ApiResponse execute(AbstractConfigTypeProvider.EmailConfigFormImpl form, BindException errors)
@@ -1628,7 +1622,7 @@ public ApiResponse execute(AbstractConfigTypeProvider.EmailConfigFormImpl form,
 
     // Used for testing announcement daily digest email notifications
     @RequiresSiteAdmin
-    public class SendDailyDigestAction extends MutatingApiAction
+    public static class SendDailyDigestAction extends MutatingApiAction<Object>
     {
         @Override
         public Object execute(Object o, BindException errors)
@@ -1735,7 +1729,7 @@ public void validate(Errors errors)
             {
                 String expires = StringUtils.trimToNull(get("expires"));
                 if (null != expires)
-                    DateUtil.parseDateTime(getContainer(), expires);
+                    DateUtil.parseDateTime(expires);
             }
             catch (ConversionException x)
             {
@@ -2080,7 +2074,7 @@ public static class AnnouncementWebPartFactory extends AlwaysAvailableWebPartFac
         }
 
         @Override
-        public WebPartView getWebPartView(@NotNull ViewContext parentCtx, @NotNull Portal.WebPart webPart)
+        public WebPartView<?> getWebPartView(@NotNull ViewContext parentCtx, @NotNull Portal.WebPart webPart)
         {
             String jsp = "/org/labkey/announcements/announcementWebPartWithExpandos.jsp";
             if ("simple".equals(webPart.getPropertyMap().get("style")))
@@ -2089,7 +2083,7 @@ public WebPartView getWebPartView(@NotNull ViewContext parentCtx, @NotNull Porta
         }
 
         @Override
-        public HttpView getEditView(Portal.WebPart webPart, ViewContext context)
+        public HttpView<?> getEditView(Portal.WebPart webPart, ViewContext context)
         {
             return new AnnouncementsController.CustomizeAnnouncementWebPart(webPart);
         }
@@ -2147,7 +2141,7 @@ private static String getFilterText(Settings settings, boolean displayAll, boole
             sb.append(rowLimit);
         }
 
-        if (sb.length() == 0)
+        if (sb.isEmpty())
             sb.append("all");
 
         sb.append(" ");
@@ -2158,9 +2152,9 @@ private static String getFilterText(Settings settings, boolean displayAll, boole
     }
 
 
-    public static class AnnouncementListWebPart extends WebPartView
+    public static class AnnouncementListWebPart extends WebPartView<Object>
     {
-        private VBox _vbox;
+        private final VBox _vbox;
 
         public AnnouncementListWebPart(ViewContext ctx)
         {
@@ -2350,7 +2344,7 @@ public ThreadView(Container c, ActionURL url, AnnouncementModel ann, Permissions
         public ThreadView(AnnouncementForm form, Container c, ActionURL url, Permissions perm, boolean print)
         {
             this();
-            AnnouncementModel ann = findThread(c, (String)form.get("rowId"), (String)form.get("entityId"));
+            AnnouncementModel ann = findThread(c, form.get("rowId"), form.get("entityId"));
             init(c, ann, url, perm, false, print);
         }
 
@@ -2509,7 +2503,7 @@ public void setUnsubscribe(boolean unsubscribe)
     }
 
     @RequiresLogin @RequiresPermission(ReadPermission.class)
-    public class SubscribeThreadAction extends FormHandlerAction<SubscriptionBean>
+    public static class SubscribeThreadAction extends FormHandlerAction<SubscriptionBean>
     {
         @Override
         public void validateCommand(SubscriptionBean target, Errors errors)
@@ -2537,14 +2531,22 @@ public boolean handlePost(SubscriptionBean bean, BindException errors)
                 throw new UnauthorizedException();
             }
 
+            // We track the subscriptions on the last post for the thread
+            Integer postId = AnnouncementManager.getLatestPostId(ann);
+            if (postId == null)
+            {
+                postId = ann.getRowId();
+            }
+
             // Remove or add the thread-level subscription from the database table
             if (bean.isUnsubscribe())
             {
-                new SqlExecutor(CommSchema.getInstance().getSchema()).execute("DELETE FROM comm.userlist WHERE UserId = ? AND MessageId = ?", getUser(), ann.getRowId());
+                new SqlExecutor(CommSchema.getInstance().getSchema()).execute("DELETE FROM comm.userlist WHERE UserId = ? AND MessageId = ?", getUser(), postId);
             }
             else if (!ann.getMemberListIds().contains(getUser().getUserId()))
             {
-                new SqlExecutor(CommSchema.getInstance().getSchema()).execute("INSERT INTO comm.userlist (UserId, MessageId) VALUES (?, ?)", getUser(), ann.getRowId());
+                new SqlExecutor(CommSchema.getInstance().getSchema()).execute("INSERT INTO comm.userlist (UserId, MessageId) SELECT ? AS UserId, ? AS MessageId WHERE NOT EXISTS (SELECT * FROM comm.userlist WHERE UserId = ? AND MessageId = ?)",
+                        getUser(), postId, getUser(), postId);
             }
             return true;
         }
@@ -2869,7 +2871,7 @@ public void setDiscussionSrcIdentifier(String discussionSrcIdentifier)
     }
 
     @RequiresPermission(ReadPermission.class)
-    public class GetDiscussionsAction extends ReadOnlyApiAction<GetDiscussionsForm>
+    public static class GetDiscussionsAction extends ReadOnlyApiAction<GetDiscussionsForm>
     {
         @Override
         public void validateForm(GetDiscussionsForm form, Errors errors)

api/src/org/labkey/api/jsp/taglib/OptionsTag.java

@@ -33,8 +33,8 @@ public class OptionsTag extends SimpleTagBase
 
     public boolean isSelected(Object test)
     {
-        if (_value instanceof Collection)
-            return ((Collection)_value).contains(test);
+        if (_value instanceof Collection<?> c)
+            return c.contains(test);
         else
             return Objects.equals(test, _value);
     }

api/src/org/labkey/api/util/ReturnURLString.java

@@ -33,9 +33,6 @@
 
 /**
  * Use ReturnURLString in Spring form beans to sanitize and convert Strings into ActionURL or URLHelper when binding parameters.
- *
- * User: matthewb
- * Date: Nov 3, 2009
  */
 public class ReturnURLString
 {
@@ -203,12 +200,20 @@ public Object convert(Class type, Object value)
             if (value instanceof ReturnURLString)
                 return value;
             CharSequence seq;
-            if (value instanceof CharSequence)
-                seq = (CharSequence)value;
+            if (value instanceof CharSequence cs)
+                seq = cs;
             else
                 seq = (String)_impl.convert(String.class, value);
 
-            return new ReturnURLString(seq);
+            try
+            {
+                return new ReturnURLString(seq);
+            }
+            catch (IllegalArgumentException e)
+            {
+                // Invalid URL
+                throw new ConversionException(e);
+            }
         }
     }
 }

query/src/org/labkey/query/controllers/QueryController.java

@@ -42,6 +42,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONParserConfiguration;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -2555,8 +2556,15 @@ else if (!isHidden)
 
         JSONObject ret = new JSONObject();
         ret.put("redirect", returnUrl);
-        if (view != null)
-            ret.put("view", CustomViewUtil.toMap(view, getUser(), true));
+        Map<String, Object> viewAsMap = CustomViewUtil.toMap(view, getUser(), true);
+        try
+        {
+            ret.put("view", new JSONObject(viewAsMap, new JSONParserConfiguration().withMaxNestingDepth(10)));
+        }
+        catch (JSONException e)
+        {
+            LOG.error("Failed to save view: {}", jsonView, e);
+        }
         return ret;
     }
 

query/src/org/labkey/query/view/CustomViewSetKey.java

@@ -116,7 +116,7 @@ static public CstmView saveCustomViewInSession(HttpServletRequest request, Query
         Map<CustomViewSetKey, Map<String, CstmView>> fullMap = getMap(request);
         if (fullMap == null)
         {
-            fullMap = new HashMap<>();
+            fullMap = Collections.synchronizedMap(new HashMap<>());
         }
 
         Map<String, CstmView> map = fullMap.computeIfAbsent(new CustomViewSetKey(queryDef), k -> new HashMap<>());