From af0e3eb9ab093645c73de54fadc61266c7a87e56 Mon Sep 17 00:00:00 2001
From: labkey-danield <danield@labkey.com>
Date: Mon, 17 Aug 2026 16:08:31 -0700
Subject: [PATCH 1/2] Remove redundant FMSampleTypeDefinition. Replace calls to
 FMSampleTypeDefinition with SampleTypeDefinition

---
 .../test/params/experiment/SampleTypeDefinition.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/labkey/test/params/experiment/SampleTypeDefinition.java b/src/org/labkey/test/params/experiment/SampleTypeDefinition.java
index 2eececdb96..1ddfecb098 100644
--- a/src/org/labkey/test/params/experiment/SampleTypeDefinition.java
+++ b/src/org/labkey/test/params/experiment/SampleTypeDefinition.java
@@ -111,7 +111,7 @@ public SampleTypeDefinition setLinkedDatasetCategory(String value)
         return this;
     }
 
-    protected InventoryMetricUnit getInventoryMetricUnit()
+    public InventoryMetricUnit getInventoryMetricUnit()
     {
         return _inventoryMetricUnit;
     }
@@ -122,23 +122,23 @@ public SampleTypeDefinition setInventoryMetricUnit(InventoryMetricUnit inventory
         return this;
     }
 
-    protected String getLabelColor()
+    public String getLabelColor()
     {
         return _labelColor;
     }
 
-    protected SampleTypeDefinition setLabelColor(String color)
+    public SampleTypeDefinition setLabelColor(String color)
     {
         _labelColor = color;
         return this;
     }
 
-    protected String getAliquotNameExpression()
+    public String getAliquotNameExpression()
     {
         return _aliquotNameExpression;
     }
 
-    protected SampleTypeDefinition setAliquotNameExpression(String aliquotNameExpression)
+    public SampleTypeDefinition setAliquotNameExpression(String aliquotNameExpression)
     {
         _aliquotNameExpression = aliquotNameExpression;
         return this;

From 6fae3f8dc3d6a946e3a30147b75471b8e2a03569 Mon Sep 17 00:00:00 2001
From: labkey-danield <danield@labkey.com>
Date: Tue, 18 Aug 2026 13:00:17 -0700
Subject: [PATCH 2/2] Adding javadoc comments identifying those methods
 primarily used by sample types in the apps.

---
 .../experiment/SampleTypeDefinition.java      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/org/labkey/test/params/experiment/SampleTypeDefinition.java b/src/org/labkey/test/params/experiment/SampleTypeDefinition.java
index 1ddfecb098..076927f3b9 100644
--- a/src/org/labkey/test/params/experiment/SampleTypeDefinition.java
+++ b/src/org/labkey/test/params/experiment/SampleTypeDefinition.java
@@ -111,33 +111,60 @@ public SampleTypeDefinition setLinkedDatasetCategory(String value)
         return this;
     }
 
+    /**
+     * Pretty much limited to Sample Types in the apps.
+     * @return an InventoryMetricUnit value
+     */
     public InventoryMetricUnit getInventoryMetricUnit()
     {
         return _inventoryMetricUnit;
     }
 
+    /**
+     * Pretty much limited to Sample Types in the apps.
+     * @param inventoryMetricUnit an InventoryMetricUnit value
+     * @return This SampleTypeDefinition object
+     */
     public SampleTypeDefinition setInventoryMetricUnit(InventoryMetricUnit inventoryMetricUnit)
     {
         _inventoryMetricUnit = inventoryMetricUnit;
         return this;
     }
 
+    /**
+     * Pretty much limited to Sample Types in the apps.
+     * @return The hex value of the label color.
+     */
     public String getLabelColor()
     {
         return _labelColor;
     }
 
+    /**
+     * Pretty much limited to Sample Types in the apps.
+     * @param color Hex value of the label color.
+     * @return This SampleTypeDefinition object
+     */
     public SampleTypeDefinition setLabelColor(String color)
     {
         _labelColor = color;
         return this;
     }
 
+    /**
+     * Pretty much limited to Sample Types in the apps.
+     * @return The name expression to use for aliquot creation.
+     */
     public String getAliquotNameExpression()
     {
         return _aliquotNameExpression;
     }
 
+    /**
+     * Pretty much limited to Sample Types in the apps.
+     * @param aliquotNameExpression The name expression to use for aliquot creation.
+     * @return This SampleTypeDefinition object
+     */
     public SampleTypeDefinition setAliquotNameExpression(String aliquotNameExpression)
     {
         _aliquotNameExpression = aliquotNameExpression;