Report duplicate and overlapping database indices

.gitattributes

@@ -253,7 +253,6 @@ api/src/org/labkey/api/assay/AssaySaveHandler.java -text
 api/src/org/labkey/api/assay/AssaySchema.java -text
 api/src/org/labkey/api/assay/AssayService.java -text
 api/src/org/labkey/api/assay/AssayTableMetadata.java -text
-api/src/org/labkey/api/assay/AssayUploadFileResolver.java -text
 api/src/org/labkey/api/assay/AssayUploadXarContext.java -text
 api/src/org/labkey/api/assay/AssayUrls.java -text
 api/src/org/labkey/api/assay/AssayView.java -text
@@ -618,7 +617,6 @@ api/src/org/labkey/api/exceptions/TableNotFoundException.java -text
 api/src/org/labkey/api/exp/AbstractParameter.java -text
 api/src/org/labkey/api/exp/api/AbstractExperimentDataHandler.java -text
 api/src/org/labkey/api/exp/api/AbstractProtocolInputCriteria.java -text
-api/src/org/labkey/api/exp/api/AssayDomainType.java -text
 api/src/org/labkey/api/exp/api/AssayJSONConverter.java -text
 api/src/org/labkey/api/exp/api/DataType.java -text
 api/src/org/labkey/api/exp/api/DefaultExperimentDataHandler.java -text

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

@@ -77,7 +77,7 @@ public final ModelAndView handleRequest() throws Exception
                     ModelAndView mv = getSuccessView(form);
                     if (null != mv)
                         return mv;
-                    throw new RedirectException(getSuccessURL(form));
+                    throw new RedirectException(getSuccessURL(form), false);
                 }
             }
             else

api/src/org/labkey/api/settings/LookAndFeelProperties.java

@@ -277,7 +277,7 @@ public Boolean isDiscussionEnabledStored()
 
     public String getUnsubstitutedLogoHref()
     {
-        return lookupStringValue(logoHref, AppProps.getInstance().getHomePageUrl().replaceAll("^" + AppProps.getInstance().getContextPath(), "\\${contextPath}"));
+        return lookupStringValue(logoHref, AppProps.getInstance().getHomePageActionURL().getLocalURIString().replaceAll("^" + AppProps.getInstance().getContextPath(), "\\${contextPath}"));
     }
 
     public String getUnsubstitutedLogoHrefStored()

api/src/org/labkey/api/view/HttpView.java

@@ -594,13 +594,12 @@ protected void renderInternal(Object model, PrintWriter out) throws IOException
 
     public static HttpView<?> redirect(URLHelper url, boolean allowAbsoluteUrl)
     {
-        String redirectUrl = (!allowAbsoluteUrl || url.isLocalUri(getRootContext())) ? url.getLocalURIString() : url.getURIString();
-        throw new RedirectException(redirectUrl);
+        throw new RedirectException(url, allowAbsoluteUrl);
     }
 
     public static HttpView<?> redirect(ActionURL url)
     {
-        throw new RedirectException(url.getLocalURIString());
+        throw new RedirectException(url);
     }
 
     /**

api/src/org/labkey/api/view/PermanentRedirectException.java

@@ -5,12 +5,12 @@
 
 import jakarta.servlet.http.HttpServletResponse;
 
-/** Use when we want search engines, browsers, etc to assume that the redirecting URL is defunct and the target URL should be used going forward */
+/** Use when we want search engines, browsers, etc. to assume that the redirecting URL is defunct and the target URL should be used going forward */
 public class PermanentRedirectException extends RedirectException
 {
     public PermanentRedirectException(@NotNull URLHelper url)
     {
-        super(url);
+        super(url, false);
     }
 
     @Override

api/src/org/labkey/api/view/RedirectException.java

@@ -29,7 +29,18 @@ public class RedirectException extends RuntimeException implements SkipMothershi
 {
     private final String _url;
 
+    @Deprecated // Call the variant that takes allowAbsoluteUrl
     public RedirectException(@NotNull URLHelper url)
+    {
+        this(url, false);
+    }
+
+    public RedirectException(@NotNull URLHelper url, boolean allowAbsoluteUrl)
+    {
+        this(!allowAbsoluteUrl || url.isLocalUri(HttpView.getRootContext()) ? url.getLocalURIString() : url.getURIString());
+    }
+
+    public RedirectException(@NotNull ActionURL url)
     {
         this(url.getLocalURIString());
     }

core/src/org/labkey/core/login/termsOfUse.jsp

@@ -42,7 +42,7 @@
 
     // Redirect immediately if terms are blank or null
     if (HtmlString.isBlank(termsHtml))
-        throw new RedirectException(returnUrl);
+        throw new RedirectException(returnUrl, false);
 
     ActionURL formURL = urlFor(AgreeToTermsAction.class);
 %>

core/src/org/labkey/core/thumbnail/ThumbnailCache.java

@@ -54,7 +54,7 @@ public static CacheableWriter getThumbnailWriter(ThumbnailProvider provider, Ima
             URLHelper redirectURL = ThumbnailUtil.getStaticThumbnailURL(provider, imageType);
 
             if (null != redirectURL)
-                throw new RedirectException(redirectURL);
+                throw new RedirectException(redirectURL, false);
         }
 
         return dynamic;

core/src/org/labkey/core/webdav/DavController.java

@@ -18,6 +18,12 @@
 
 package org.labkey.core.webdav;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.io.FileUtils;
@@ -72,7 +78,28 @@
 import org.labkey.api.settings.LookAndFeelProperties;
 import org.labkey.api.settings.OptionalFeatureService;
 import org.labkey.api.test.TestWhen;
-import org.labkey.api.util.*;
+import org.labkey.api.util.CSRFException;
+import org.labkey.api.util.CSRFUtil;
+import org.labkey.api.util.ConfigurationException;
+import org.labkey.api.util.DateUtil;
+import org.labkey.api.util.ErrorRenderer;
+import org.labkey.api.util.ExceptionUtil;
+import org.labkey.api.util.FileStream;
+import org.labkey.api.util.FileUtil;
+import org.labkey.api.util.GUID;
+import org.labkey.api.util.HeartBeat;
+import org.labkey.api.util.HttpUtil;
+import org.labkey.api.util.MemTracker;
+import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.util.Pair;
+import org.labkey.api.util.Path;
+import org.labkey.api.util.ResponseHelper;
+import org.labkey.api.util.ShutdownListener;
+import org.labkey.api.util.StringUtilsLabKey;
+import org.labkey.api.util.URIUtil;
+import org.labkey.api.util.URLHelper;
+import org.labkey.api.util.UnexpectedException;
+import org.labkey.api.util.XmlBeansUtil;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DefaultModelAndView;
@@ -115,14 +142,7 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletResponseWrapper;
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.Part;
 import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -194,8 +214,6 @@
 
 
 /**
- * User: matthewb
- * Date: Oct 3, 2007
  * Derived from Tomcat's WebdavServlet
  */
 public class DavController extends SpringActionController
@@ -873,7 +891,7 @@ public final WebdavStatus doMethod() throws DavException, IOException
                     throw x;
                 // NOTE: AppProps.getInstance().getSiteWelcomePageUrlString() is handled before we even get here.  See WebdavServlet.
                 if (c.isRoot())
-                    throw new RedirectException(AppProps.getInstance().getHomePageUrl());
+                    throw new RedirectException(AppProps.getInstance().getHomePageActionURL());
                 throw new RedirectException(c.getStartURL(getUser()));
             }
         }

devtools/src/org/labkey/devtools/DevtoolsModule.java

@@ -17,7 +17,6 @@
 package org.labkey.devtools;
 
 import org.jetbrains.annotations.NotNull;
-import org.labkey.api.data.ContainerManager;
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.module.CodeOnlyModule;
 import org.labkey.api.module.ModuleContext;
@@ -72,8 +71,6 @@ protected void init()
     @Override
     public void doStartup(ModuleContext moduleContext)
     {
-        // add a container listener so we'll know when our container is deleted:
-        ContainerManager.addContainerListener(new DevtoolsContainerListener());
     }
 
     @Override