ExpObjectDataIterator: consolidate iterator logic

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

@@ -2099,13 +2099,13 @@ public static class NameGenerationException extends Exception
     {
         private final int _rowNumber;
 
-        NameGenerationException(String message, int rowNumber)
+        public NameGenerationException(String message, int rowNumber)
         {
             super(message);
             _rowNumber = rowNumber;
         }
 
-        NameGenerationException(int rowNumber, Throwable t)
+        public NameGenerationException(int rowNumber, Throwable t)
         {
             super(t);
             _rowNumber = rowNumber;

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

@@ -57,24 +57,24 @@ public class NameGeneratorState implements AutoCloseable
 {
     private final @NotNull NameGenerator _nameGenerator;
     private final boolean _incrementSampleCounts;
-    private final User _user;
+    protected final User _user;
     private final Map<String, Object> _batchExpressionContext;
     private Function<Map<String,Long>,Map<String,Long>> getSampleCountsFunction;
     private final Map<String, Integer> _newNames = new CaseInsensitiveHashMap<>();
 
-    private int _rowNumber = 0;
+    protected int _rowNumber = 0;
     private final Map<Tuple3<String, Object, FieldKey>, Object> _lookupCache;
     private final Map<String, ArrayList<Object>> _ancestorCache;
     private final Map<String, ArrayList<Object>> _ancestorSearchCache;
     private final Map<String, Map<String, DbSequence>> _prefixCounterSequences;
 
     private final NameGenerator.ProjectSampleCounters _sampleCounters;
     private boolean _counterSequencesCleaned = false;
-    private final Container _container;
+    protected final Container _container;
 
-    private final Map<Integer, ExpMaterial> materialCache = new HashMap<>();
-    private final Map<Integer, ExpData> dataCache = new HashMap<>();
-    private final RemapCache renameCache;
+    protected final Map<Integer, ExpMaterial> materialCache = new HashMap<>();
+    protected final Map<Integer, ExpData> dataCache = new HashMap<>();
+    protected final RemapCache renameCache;
     private final Map<String, Map<String, Object>> objectPropertiesCache = new HashMap<>();
 
     public NameGeneratorState(@NotNull NameGenerator nameGenerator, boolean incrementSampleCounts, NameGenerator.SampleNameExpressionSummary expressionSummary)
@@ -292,8 +292,8 @@ private String genName(@NotNull Map<String, Object> rowMap,
 
         StringExpressionFactory.FieldKeyStringExpression expression = activeNameGenerator.getParsedNameExpression();
         String name;
-        if (expression instanceof NameGenerator.NameGenerationExpression)
-            name = ((NameGenerator.NameGenerationExpression) expression).eval(ctx, _prefixCounterSequences);
+        if (expression instanceof NameGenerator.NameGenerationExpression nge)
+            name = nge.eval(ctx, _prefixCounterSequences);
         else
             name = expression.eval(ctx);
         if (name == null || name.isEmpty())
@@ -417,14 +417,14 @@ private void addAncestorLookupValues(
                 String parentType = ancestorOptions.parentType();
                 if (!StringUtils.isEmpty(parentType))
                 {
-                    if (parentObject instanceof ExpMaterial)
+                    if (parentObject instanceof ExpMaterial expMaterial)
                     {
-                        if (!((ExpMaterial) parentObject).getSampleType().getName().equalsIgnoreCase(parentType))
+                        if (!expMaterial.getSampleType().getName().equalsIgnoreCase(parentType))
                             continue;
                     }
-                    else if (parentObject instanceof ExpData)
+                    else if (parentObject instanceof ExpData expData)
                     {
-                        if (!((ExpData) parentObject).getDataClass(_user).getName().equalsIgnoreCase(parentType))
+                        if (!expData.getDataClass(_user).getName().equalsIgnoreCase(parentType))
                             continue;
                     }
                 }
@@ -490,7 +490,6 @@ else if (parentObject instanceof ExpData)
                 }
             }
         }
-
     }
 
     private void addParentLookupContext(String parentTypeName/* already decoded */,

api/src/org/labkey/api/dataiterator/NameExpressionDataIterator.java

@@ -63,7 +63,6 @@ public NameExpressionDataIterator(DataIterator di, DataIteratorContext context,
         _container = container;
         _getNonConflictCountFn = getNonConflictCountFn;
         _counterSeqPrefix = counterSeqPrefix;
-
     }
 
     public NameExpressionDataIterator setAllowUserSpecifiedNames(boolean allowUserSpecifiedNames)
@@ -80,7 +79,7 @@ public NameExpressionDataIterator addExtraPropsFn(Supplier<Map<String, Object>>
 
     MapDataIterator getInput()
     {
-        return (MapDataIterator)_delegate;
+        return (MapDataIterator) _delegate;
     }
 
     private BatchValidationException getErrors()

api/src/org/labkey/api/exp/query/ExpMaterialTable.java

@@ -37,6 +37,7 @@ enum Column
         Folder,
         Inputs,
         IsAliquot,
+        IsPlated,
         LSID,
         MaterialExpDate,
         MaterialSourceId,
@@ -60,8 +61,7 @@ enum Column
         SourceProtocolApplication,
         SourceProtocolLSID,
         StoredAmount,
-        Units,
-        IsPlated;
+        Units;
 
         public FieldKey fieldKey()
         {