Merge remote-tracking branch 'origin/release26.3-SNAPSHOT' into 26.3_fb_sql_server_migration_1

Author: labkey-bpatel

api/src/org/labkey/api/admin/AdminBean.java

@@ -24,7 +24,6 @@
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.CoreSchema;
 import org.labkey.api.data.DbScope;
-import org.labkey.api.module.Module;
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.UserManager;
 import org.labkey.api.settings.AppProps;
@@ -43,7 +42,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -82,7 +80,6 @@ public static class RecentUser
     public static final String sessionTimeout = Formats.commaf0.format(ModuleLoader.getServletContext().getSessionTimeout());
     public static final String buildTime = ModuleLoader.getInstance().getCoreModule().getBuildTime();
     public static final String serverStartupTime = DateUtil.formatDateTime(ContainerManager.getRoot());
-    public static final List<Module> modules;
 
     public static String asserts = "disabled";
 
@@ -116,9 +113,6 @@ public static class RecentUser
 
         //noinspection ConstantConditions,AssertWithSideEffects
         assert null != (asserts = "enabled");
-
-        modules = new ArrayList<>(ModuleLoader.getInstance().getModules());
-        modules.sort(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER));
     }
 
     private static @Nullable String getValue(Field field)

api/src/org/labkey/api/data/BeanViewForm.java

@@ -20,7 +20,10 @@
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.beanutils.DynaClass;
+import org.labkey.api.action.BaseViewAction.BeanUtilsPropertyBindingResult;
 import org.labkey.api.action.HasBindParameters;
+import org.labkey.api.action.NullSafeBindException;
+import org.springframework.validation.BindException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -86,6 +89,13 @@ public void setBean(K bean)
         setTypedValues(factory.toMap(bean, null), false);
     }
 
+    @Override
+    public BindException createErrors()
+    {
+        // Teaches Spring to resolve field names via string lookups instead of getters. e.g., errors.rejectValue().
+        return new NullSafeBindException(new BeanUtilsPropertyBindingResult(this, "form"));
+    }
+
     @Override
     public Map<String, Object> getValuesToBind()
     {

api/src/org/labkey/api/data/TableViewForm.java

@@ -30,7 +30,6 @@
 import org.labkey.api.action.NullSafeBindException;
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
-import org.labkey.api.ontology.Quantity;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.security.permissions.DeletePermission;
 import org.labkey.api.security.permissions.InsertPermission;
@@ -897,10 +896,16 @@ else if (orig.getName().startsWith(ARRAY_MARKER) && orig.getValue()!=null)
             setValueToBind(pv.getName(), pv.getValue());
         }
 
-        BindException errors = new NullSafeBindException(this, "form");
+        BindException errors = createErrors();
         validateBind(errors);
         return errors;
     }
+
+    // Construct and return a BindException that's appropriate for this form
+    public BindException createErrors()
+    {
+        return new NullSafeBindException(this, "form");
+    }
 }
 
 

api/src/org/labkey/api/query/UserSchemaAction.java

@@ -17,7 +17,6 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.action.FormViewAction;
-import org.labkey.api.action.NullSafeBindException;
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.attachments.SpringAttachmentFile;
 import org.labkey.api.audit.TransactionAuditProvider;
@@ -79,7 +78,7 @@ public BindException bindParameters(PropertyValues m) throws Exception
         QueryUpdateForm command = new QueryUpdateForm(_table, getViewContext(), null);
         if (command.isBulkUpdate())
             command.setValidateRequired(false);
-        BindException errors = new NullSafeBindException(new BeanUtilsPropertyBindingResult(command, "form"));
+        BindException errors = command.createErrors();
         command.validateBind(errors);
         return errors;
     }

core/src/org/labkey/core/admin/AdminController.java

@@ -9193,7 +9193,7 @@ protected void renderView(Object model, HtmlWriter out)
                                         if (null != module.getZippedPath())
                                             p = module.getZippedPath().toPath();
                                         if (isDevMode && ModuleEditorService.get().canEditSourceModule(module))
-                                            if (!module.getExplodedPath().getPath().equals(module.getSourcePath()))
+                                            if (!isBlank(module.getSourcePath()) && !module.getExplodedPath().getPath().equals(module.getSourcePath()))
                                                 p = Paths.get(module.getSourcePath());
                                         fullPathToModule = p.toString();
                                         shortPathToModule = fullPathToModule;

core/src/org/labkey/core/admin/admin.jsp

@@ -23,6 +23,7 @@
 <%@ page import="org.labkey.api.files.FileContentService" %>
 <%@ page import="org.labkey.api.module.DefaultModule" %>
 <%@ page import="org.labkey.api.module.Module" %>
+<%@ page import="org.labkey.api.module.ModuleLoader"%>
 <%@ page import="org.labkey.api.moduleeditor.api.ModuleEditorService" %>
 <%@ page import="org.labkey.api.settings.AdminConsole" %>
 <%@ page import="org.labkey.api.settings.AdminConsole.AdminLink" %>
@@ -36,7 +37,9 @@
 <%@ page import="java.time.Duration" %>
 <%@ page import="java.time.LocalDateTime" %>
 <%@ page import="java.time.format.DateTimeFormatter" %>
+<%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Comparator" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.TreeMap" %>
 <%@ page import="org.apache.commons.lang3.Strings" %>
@@ -152,7 +155,9 @@
             <%=link("Module Details", AdminController.ModulesAction.class)%>
             <br/><br/>
             <table><%
-                for (Module module : AdminBean.modules)
+                ArrayList<Module> modules = new ArrayList<>(ModuleLoader.getInstance().getModules());
+                modules.sort(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER));
+                for (Module module : modules)
                 {
                     String guid = makeId("m_");
                     String toggleScript = "return LABKEY.Utils.toggleLink(document.getElementById(" + q(guid) + "), false);";

study/src/org/labkey/study/pipeline/FileAnalysisDatasetTask.java

@@ -16,7 +16,6 @@
 package org.labkey.study.pipeline;
 
 import org.jetbrains.annotations.NotNull;
-import org.labkey.api.action.BaseViewAction;
 import org.labkey.api.action.NullSafeBindException;
 import org.labkey.api.admin.PipelineJobLoggerGetter;
 import org.labkey.api.assay.transform.DataTransformService;
@@ -114,7 +113,7 @@ else if (params.containsKey(DataTransformService.ORIGINAL_SOURCE_PATH))
             for (String error : readerErrors)
                 _ctx.getLogger().error(error);
 
-            BindException errors = new NullSafeBindException(new BaseViewAction.BeanUtilsPropertyBindingResult(this, "pipeline"));
+            BindException errors = new NullSafeBindException(this, "pipeline");
             boolean allowDomainUpdates = true;
             if (_ctx.getProperties().containsKey(StudyImportContext.ALLOW_DOMAIN_UPDATES))
                 allowDomainUpdates = Boolean.parseBoolean(_ctx.getProperties().get(StudyImportContext.ALLOW_DOMAIN_UPDATES));