Still more forUpdate parameters (#891)

labkey-susanh · web-flow · commit 7c9c0712c097 · 2025-06-04T07:36:38.000-07:00
diff --git a/elisa/src/org/labkey/elisa/ElisaAssayProvider.java b/elisa/src/org/labkey/elisa/ElisaAssayProvider.java
@@ -410,7 +410,7 @@ public DataExchangeHandler createDataExchangeHandler()
 
     public Domain getConcentrationWellGroupDomain(ExpProtocol protocol)
     {
-        return getDomainByPrefix(protocol, ASSAY_DOMAIN_DATA);
+        return getDomainByPrefix(protocol, ASSAY_DOMAIN_DATA, false);
     }
 
     @Override
diff --git a/elispotassay/src/org/labkey/elispot/ElispotAssayProvider.java b/elispotassay/src/org/labkey/elispot/ElispotAssayProvider.java
@@ -222,7 +222,7 @@ public AssayTableMetadata getTableMetadata(@NotNull ExpProtocol protocol)
     }
 
     @Override
-    public Domain getResultsDomain(ExpProtocol protocol)
+    public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate)
     {
         return null;
     }
@@ -350,12 +350,12 @@ public ActionURL getImportURL(Container container, ExpProtocol protocol)
 
     public Domain getAntigenWellGroupDomain(ExpProtocol protocol)
     {
-        return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+        return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
     }
 
     public Domain getAnalyteDomain(ExpProtocol protocol)
     {
-        return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANALYTE);
+        return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANALYTE, false);
     }
 
     @Override
diff --git a/elispotassay/src/org/labkey/elispot/ElispotDataHandler.java b/elispotassay/src/org/labkey/elispot/ElispotDataHandler.java
@@ -265,7 +265,7 @@ public static void populateAntigenDataProperties(ExpRun run, Plate plate, PlateR
         {
             Container container = run.getContainer();
 
-            Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+            Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
             DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME);
 
             List<? extends ExpData> data = run.getOutputDatas(ElispotDataHandler.ELISPOT_DATA_TYPE);
@@ -324,7 +324,7 @@ public static void populateAntigenRunProperties(ExpRun run, Plate plate, PlateRe
         {
             Container container = run.getContainer();
 
-            Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+            Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
             List<? extends DomainProperty> antigenProps = antigenDomain.getProperties();
             DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME);
 
diff --git a/elispotassay/src/org/labkey/elispot/ElispotManager.java b/elispotassay/src/org/labkey/elispot/ElispotManager.java
@@ -76,7 +76,7 @@ public static TableInfo getTableInfoElispotRunData()
     @NotNull
     public static TableInfo getTableInfoElispotAntigen(ExpProtocol protocol)
     {
-        Domain domain = AbstractAssayProvider.getDomainByPrefix(protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+        Domain domain = AbstractAssayProvider.getDomainByPrefix(protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
         if (null != domain)
             return StorageProvisioner.createTableInfo(domain);
         throw new IllegalStateException("Domain not found for protocol: " + protocol.getName());
diff --git a/elispotassay/src/org/labkey/elispot/ElispotProtocolSchema.java b/elispotassay/src/org/labkey/elispot/ElispotProtocolSchema.java
@@ -84,7 +84,7 @@ public TableInfo createProviderTable(String name, ContainerFilter cf)
     {
         if (name.equalsIgnoreCase(ANTIGEN_TABLE_NAME))
         {
-            Domain domain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+            Domain domain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
             if (null != domain)
                 return new ElispotRunAntigenTable(this, cf, domain, getProtocol());
         }
diff --git a/elispotassay/src/org/labkey/elispot/ElispotUploadWizardAction.java b/elispotassay/src/org/labkey/elispot/ElispotUploadWizardAction.java
@@ -168,7 +168,7 @@ public PlateAnalytePropertyHelper createAnalytePropertyHelper(ElispotRunUploadFo
     @Override
     protected void addRunActionButtons(ElispotRunUploadForm newRunForm, InsertView insertView, ButtonBar bbar)
     {
-        Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+        Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
         List<? extends DomainProperty> antigenColumns = antigenDomain.getProperties();
         if (antigenColumns.isEmpty())
         {
@@ -338,7 +338,7 @@ public boolean executeStep(ElispotRunUploadForm form, BindException errors) thro
                 }
             }
 
-            Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(form.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+            Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(form.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
             List<? extends DomainProperty> antigenColumns = antigenDomain.getProperties();
             if (antigenColumns.isEmpty())
             {
diff --git a/elispotassay/src/org/labkey/elispot/pipeline/BackgroundSubtractionJob.java b/elispotassay/src/org/labkey/elispot/pipeline/BackgroundSubtractionJob.java
@@ -124,7 +124,7 @@ public void run()
                     {
                         String dataLsid = data.get(0).getLSID();
                         Map<String, Object> propMap = new HashMap<>();
-                        Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+                        Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
 
                         DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME);
                         DomainProperty antigenNameProp = antigenDomain.getPropertyByName(ElispotAssayProvider.ANTIGENNAME_PROPERTY_NAME);
diff --git a/elispotassay/src/org/labkey/elispot/query/ElispotRunAntigenTable.java b/elispotassay/src/org/labkey/elispot/query/ElispotRunAntigenTable.java
@@ -90,7 +90,7 @@ protected ColumnInfo resolveColumn(String name)
                 @Override
                 public TableInfo getLookupTableInfo()
                 {
-                    Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);
+                    Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);
                     return new ElispotRunAntigenTable(_userSchema, getLookupContainerFilter(), domain, _protocol);
                 }
             };
diff --git a/flow/src/org/labkey/flow/data/FlowAssayProvider.java b/flow/src/org/labkey/flow/data/FlowAssayProvider.java
@@ -198,12 +198,18 @@ public Domain getRunDomain(ExpProtocol protocol)
 
     @Override
     public Domain getBatchDomain(ExpProtocol protocol)
+    {
+        return getBatchDomain(protocol, false);
+    }
+
+    @Override
+    public Domain getBatchDomain(ExpProtocol protocol, boolean forUpdate)
     {
         return null;
     }
 
     @Override
-    public Domain getResultsDomain(ExpProtocol protocol)
+    public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate)
     {
         return null;
     }
diff --git a/flow/src/org/labkey/flow/reports/FlowReportManager.java b/flow/src/org/labkey/flow/reports/FlowReportManager.java
@@ -202,7 +202,7 @@ public static Domain ensureDomain(FlowReport report, User user, FlowTableType ta
             domain.setDescription("Domain for " + report.getDescriptor().getDescriptorType() + " reports on flow table " + tableType);
             domain.save(user);
 
-            domain = PropertyService.get().getDomain(domain.getTypeId());
+            domain = PropertyService.get().getDomain(domain.getTypeId(), true);
 
             for (PropertyDescriptor prop : properties)
             {
diff --git a/luminex/src/org/labkey/luminex/LuminexAssayProvider.java b/luminex/src/org/labkey/luminex/LuminexAssayProvider.java
@@ -163,11 +163,11 @@ public AssayTableMetadata getTableMetadata(@NotNull ExpProtocol protocol)
     }
 
     @Override
-    public Domain getResultsDomain(ExpProtocol protocol)
+    public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate)
     {
         try
         {
-            return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA);
+            return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA, forUpdate);
         }
         catch (IllegalArgumentException e)
         {
@@ -177,7 +177,7 @@ public Domain getResultsDomain(ExpProtocol protocol)
             addResultsDomain(protocol);
             // Clear the cache so we can find the domain we just created
             protocol.setObjectProperties(null);
-            return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA);
+            return getDomainByPrefix(protocol, ASSAY_DOMAIN_CUSTOM_DATA, forUpdate);
         }
     }
 
@@ -485,7 +485,7 @@ public boolean supportsBackgroundUpload()
 
     public static Domain getExcelRunDomain(ExpProtocol protocol)
     {
-        return AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_EXCEL_RUN);
+        return AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_EXCEL_RUN, false);
     }
 
     @Override
diff --git a/luminex/src/org/labkey/luminex/LuminexRunDatabaseContext.java b/luminex/src/org/labkey/luminex/LuminexRunDatabaseContext.java
@@ -79,7 +79,7 @@ public String[] getAnalyteNames()
     public Map<DomainProperty, String> getAnalyteProperties(String analyteName)
     {
         Analyte analyte = getAnalyte(analyteName);
-        Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE);
+        Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false);
         return getProperties(domain, OntologyManager.getPropertyObjects(_run.getContainer(), analyte.getLsid()));
     }
 
diff --git a/luminex/src/org/labkey/luminex/LuminexRunUploadForm.java b/luminex/src/org/labkey/luminex/LuminexRunUploadForm.java
@@ -118,7 +118,7 @@ protected Map<DomainProperty, String> getAnalytePropertyMapFromRequest(List<? ex
     @Override
     public Map<DomainProperty, String> getAnalyteProperties(String analyteName)
     {
-        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE);
+        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false);
         List<? extends DomainProperty> domainProperties = analyteDomain.getProperties();
         return getAnalytePropertyMapFromRequest(domainProperties, analyteName);
     }
diff --git a/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java b/luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java
@@ -109,7 +109,7 @@ public LuminexUploadWizardAction()
     @Override
     protected void addRunActionButtons(LuminexRunUploadForm newRunForm, InsertView insertView, ButtonBar bbar)
     {
-        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE);
+        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false);
         List<? extends DomainProperty> analyteColumns = analyteDomain.getProperties();
         if (analyteColumns.isEmpty())
         {
@@ -157,7 +157,7 @@ private ModelAndView getAnalytesView(String[] analyteNames, final LuminexRunUplo
         for (String analyte : analyteNames)
             view.getDataRegion().addHiddenFormField("analyteNames", analyte);
 
-        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE);
+        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false);
         List<? extends DomainProperty> analyteColumns = analyteDomain.getProperties();
         Set<String> initNegativeControlAnalytes = new TreeSet<>();
         List<String> negativeBeadDefaultValues = AnalyteDefaultValueService.getAnalyteProperty(Arrays.asList(analyteNames), getContainer(), _protocol, LuminexDataHandler.NEGATIVE_BEAD_COLUMN_NAME);
diff --git a/luminex/src/org/labkey/luminex/query/AnalyteTable.java b/luminex/src/org/labkey/luminex/query/AnalyteTable.java
@@ -41,7 +41,6 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.assay.AbstractAssayProvider;
-import org.labkey.api.assay.AssaySchema;
 import org.labkey.luminex.LuminexAssayProvider;
 import org.labkey.luminex.model.Analyte;
 
@@ -115,7 +114,7 @@ public TableInfo getLookupTableInfo()
         lsidColumn.setShownInUpdateView(false);
 
         var colProperty = wrapColumn("Properties", getRealTable().getColumn("LSID"));
-        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_userSchema.getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE);
+        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(_userSchema.getProtocol(), LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false);
         Map<String, PropertyDescriptor> map = new TreeMap<>();
         for(DomainProperty pd : analyteDomain.getProperties())
         {
diff --git a/luminex/src/org/labkey/luminex/query/LuminexDataTable.java b/luminex/src/org/labkey/luminex/query/LuminexDataTable.java
@@ -282,7 +282,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
         defaultCols.add(FieldKey.fromParts("Titration"));
 
         // issue 21253: Conditional show/hide of the Negative Bead column in the Luminex assay results grid
-        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE);
+        Domain analyteDomain = AbstractAssayProvider.getDomainByPrefix(protocol, LuminexAssayProvider.ASSAY_DOMAIN_ANALYTE, false);
         if (analyteDomain != null && analyteDomain.getPropertyByName(LuminexDataHandler.NEGATIVE_CONTROL_COLUMN_NAME) != null)
         {
             defaultCols.add(FieldKey.fromParts("Analyte", "NegativeBead"));
@@ -395,7 +395,14 @@ private SQLFragment getExclusionsUnionSQL()
     @NotNull
     public Domain getDomain()
     {
-        return _provider.getResultsDomain(_userSchema.getProtocol());
+        return getDomain(false);
+    }
+
+    @Override
+    @NotNull
+    public Domain getDomain(boolean forUpdate)
+    {
+        return _provider.getResultsDomain(_userSchema.getProtocol(), forUpdate);
     }
 
     @Override
diff --git a/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java b/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java
@@ -135,7 +135,7 @@ public List<ParticipantVisitResolverType> getParticipantVisitResolverTypes()
     }
 
     @Override
-    public Domain getResultsDomain(ExpProtocol protocol)
+    public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate)
     {
         return null;
     }
diff --git a/nab/src/org/labkey/nab/NabAssayProvider.java b/nab/src/org/labkey/nab/NabAssayProvider.java
@@ -337,7 +337,7 @@ protected Pair<Domain, Map<DomainProperty, Object>> createVirusWellGroupDomain(C
     public Domain getVirusWellGroupDomain(ExpProtocol protocol)
     {
         if (supportsMultiVirusPlate())
-            return getDomainByPrefixIfExists(protocol, ASSAY_DOMAIN_VIRUS_WELLGROUP);
+            return getDomainByPrefixIfExists(protocol, ASSAY_DOMAIN_VIRUS_WELLGROUP, false);
         else
             return null;
     }
diff --git a/viability/src/org/labkey/viability/ViabilityAssayRunUploadForm.java b/viability/src/org/labkey/viability/ViabilityAssayRunUploadForm.java
@@ -31,11 +31,9 @@
 import org.labkey.api.assay.actions.UploadWizardAction;
 import org.labkey.api.assay.AssayDataCollector;
 import org.labkey.api.assay.AssayFileWriter;
-import org.labkey.api.util.UnexpectedException;
 import org.labkey.vfs.FileLike;
 import org.springframework.validation.Errors;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/viability/src/org/labkey/viability/ViabilityAssayUploadWizardAction.java b/viability/src/org/labkey/viability/ViabilityAssayUploadWizardAction.java
@@ -173,7 +173,7 @@ protected InsertView _getResultsView(ViabilityAssayRunUploadForm form, boolean e
         List<Map<String, Object>> rows = errorReshow ? form.getResultProperties(errors) : form.getParsedResultData();
         Map<String, Map<String, Object>> reRunResults = form.getReRunResults();
 
-        Domain resultDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ExpProtocol.ASSAY_DOMAIN_DATA);
+        Domain resultDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ExpProtocol.ASSAY_DOMAIN_DATA, false);
         List<? extends DomainProperty> resultDomainProperties = resultDomain.getProperties();
         String lsidCol = "RowID";
         InsertView view = createInsertView(ViabilitySchema.getTableInfoResults(), lsidCol, resultDomainProperties, errorReshow, ResultsStepHandler.NAME, form, errors);

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ public DataExchangeHandler createDataExchangeHandler()`
`410`	`410`
`411`	`411`	`public Domain getConcentrationWellGroupDomain(ExpProtocol protocol)`
`412`	`412`	`{`
`413`		`- return getDomainByPrefix(protocol, ASSAY_DOMAIN_DATA);`
	`413`	`+ return getDomainByPrefix(protocol, ASSAY_DOMAIN_DATA, false);`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public AssayTableMetadata getTableMetadata(@NotNull ExpProtocol protocol)`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`@Override`
`225`		`- public Domain getResultsDomain(ExpProtocol protocol)`
	`225`	`+ public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate)`
`226`	`226`	`{`
`227`	`227`	`return null;`
`228`	`228`	`}`
`@@ -350,12 +350,12 @@ public ActionURL getImportURL(Container container, ExpProtocol protocol)`
`350`	`350`
`351`	`351`	`public Domain getAntigenWellGroupDomain(ExpProtocol protocol)`
`352`	`352`	`{`
`353`		`- return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`353`	`+ return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`public Domain getAnalyteDomain(ExpProtocol protocol)`
`357`	`357`	`{`
`358`		`- return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANALYTE);`
	`358`	`+ return getDomainByPrefix(protocol, ASSAY_DOMAIN_ANALYTE, false);`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public static void populateAntigenDataProperties(ExpRun run, Plate plate, PlateR`
`265`	`265`	`{`
`266`	`266`	`Container container = run.getContainer();`
`267`	`267`
`268`		`- Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`268`	`+ Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`269`	`269`	`DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME);`
`270`	`270`
`271`	`271`	`List<? extends ExpData> data = run.getOutputDatas(ElispotDataHandler.ELISPOT_DATA_TYPE);`
`@@ -324,7 +324,7 @@ public static void populateAntigenRunProperties(ExpRun run, Plate plate, PlateRe`
`324`	`324`	`{`
`325`	`325`	`Container container = run.getContainer();`
`326`	`326`
`327`		`- Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`327`	`+ Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`328`	`328`	`List<? extends DomainProperty> antigenProps = antigenDomain.getProperties();`
`329`	`329`	`DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME);`
`330`	`330`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static TableInfo getTableInfoElispotRunData()`
`76`	`76`	`@NotNull`
`77`	`77`	`public static TableInfo getTableInfoElispotAntigen(ExpProtocol protocol)`
`78`	`78`	`{`
`79`		`- Domain domain = AbstractAssayProvider.getDomainByPrefix(protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`79`	`+ Domain domain = AbstractAssayProvider.getDomainByPrefix(protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`80`	`80`	`if (null != domain)`
`81`	`81`	`return StorageProvisioner.createTableInfo(domain);`
`82`	`82`	`throw new IllegalStateException("Domain not found for protocol: " + protocol.getName());`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public TableInfo createProviderTable(String name, ContainerFilter cf)`
`84`	`84`	`{`
`85`	`85`	`if (name.equalsIgnoreCase(ANTIGEN_TABLE_NAME))`
`86`	`86`	`{`
`87`		`- Domain domain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`87`	`+ Domain domain = AbstractAssayProvider.getDomainByPrefix(getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`88`	`88`	`if (null != domain)`
`89`	`89`	`return new ElispotRunAntigenTable(this, cf, domain, getProtocol());`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public PlateAnalytePropertyHelper createAnalytePropertyHelper(ElispotRunUploadFo`
`168`	`168`	`@Override`
`169`	`169`	`protected void addRunActionButtons(ElispotRunUploadForm newRunForm, InsertView insertView, ButtonBar bbar)`
`170`	`170`	`{`
`171`		`- Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`171`	`+ Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`172`	`172`	`List<? extends DomainProperty> antigenColumns = antigenDomain.getProperties();`
`173`	`173`	`if (antigenColumns.isEmpty())`
`174`	`174`	`{`
`@@ -338,7 +338,7 @@ public boolean executeStep(ElispotRunUploadForm form, BindException errors) thro`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
`341`		`- Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(form.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`341`	`+ Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(form.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`342`	`342`	`List<? extends DomainProperty> antigenColumns = antigenDomain.getProperties();`
`343`	`343`	`if (antigenColumns.isEmpty())`
`344`	`344`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public void run()`
`124`	`124`	`{`
`125`	`125`	`String dataLsid = data.get(0).getLSID();`
`126`	`126`	`Map<String, Object> propMap = new HashMap<>();`
`127`		`- Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`127`	`+ Domain antigenDomain = AbstractAssayProvider.getDomainByPrefix(run.getProtocol(), ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`128`	`128`
`129`	`129`	`DomainProperty cellWellProp = antigenDomain.getPropertyByName(ElispotAssayProvider.CELLWELL_PROPERTY_NAME);`
`130`	`130`	`DomainProperty antigenNameProp = antigenDomain.getPropertyByName(ElispotAssayProvider.ANTIGENNAME_PROPERTY_NAME);`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ protected ColumnInfo resolveColumn(String name)`
`90`	`90`	`@Override`
`91`	`91`	`public TableInfo getLookupTableInfo()`
`92`	`92`	`{`
`93`		`- Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP);`
	`93`	`+ Domain domain = AbstractAssayProvider.getDomainByPrefix(_protocol, ElispotAssayProvider.ASSAY_DOMAIN_ANTIGEN_WELLGROUP, false);`
`94`	`94`	`return new ElispotRunAntigenTable(_userSchema, getLookupContainerFilter(), domain, _protocol);`
`95`	`95`	`}`
`96`	`96`	`};`
Original file line number	Diff line number	Diff line change
`@@ -198,12 +198,18 @@ public Domain getRunDomain(ExpProtocol protocol)`
`198`	`198`
`199`	`199`	`@Override`
`200`	`200`	`public Domain getBatchDomain(ExpProtocol protocol)`
	`201`	`+ {`
	`202`	`+ return getBatchDomain(protocol, false);`
	`203`	`+ }`
	`204`	`+`
	`205`	`+ @Override`
	`206`	`+ public Domain getBatchDomain(ExpProtocol protocol, boolean forUpdate)`
`201`	`207`	`{`
`202`	`208`	`return null;`
`203`	`209`	`}`
`204`	`210`
`205`	`211`	`@Override`
`206`		`- public Domain getResultsDomain(ExpProtocol protocol)`
	`212`	`+ public Domain getResultsDomain(ExpProtocol protocol, boolean forUpdate)`
`207`	`213`	`{`
`208`	`214`	`return null;`
`209`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public static Domain ensureDomain(FlowReport report, User user, FlowTableType ta`
`202`	`202`	`domain.setDescription("Domain for " + report.getDescriptor().getDescriptorType() + " reports on flow table " + tableType);`
`203`	`203`	`domain.save(user);`
`204`	`204`
`205`		`- domain = PropertyService.get().getDomain(domain.getTypeId());`
	`205`	`+ domain = PropertyService.get().getDomain(domain.getTypeId(), true);`
`206`	`206`
`207`	`207`	`for (PropertyDescriptor prop : properties)`
`208`	`208`	`{`