Issue 53586: Domain field with long name can result in "PropertyURI cannot exceed 300 characters, but was 302 characters long."

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

@@ -247,11 +247,7 @@ protected static Map<String,Pair<ColumnInfo,MatchType>> _createTableMap(TableInf
         {
             String uri = col.getPropertyURI();
             if (null != uri)
-            {
                 targetAliasesMap.put(uri, new Pair<>(col, MatchType.propertyuri));
-                String propName = uri.substring(uri.lastIndexOf('#')+1);
-                targetAliasesMap.put(propName, new Pair<>(col, MatchType.alias));
-            }
         }
 
         for (ColumnInfo col : cols)

api/src/org/labkey/api/exp/ImportTypesHelper.java

@@ -29,6 +29,7 @@
 import org.labkey.api.data.PHI;
 import org.labkey.api.data.PropertyStorageSpec;
 import org.labkey.api.exp.OntologyManager.ImportPropertyDescriptorsList;
+import org.labkey.api.exp.property.DomainUtil;
 import org.labkey.api.exp.property.IPropertyValidator;
 import org.labkey.api.exp.property.ValidatorKind;
 import org.labkey.api.gwt.client.DefaultScaleType;
@@ -49,6 +50,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -244,7 +246,7 @@ public static ImportPropertyDescriptorsList getImportPropertyDescriptors(Collect
             String propertyURI = StringUtils.trimToEmpty(pd.getPropertyURI());
             if (propertyURI.isEmpty())
             {
-                pd.setPropertyURI(domainURI + "." + Lsid.encodePart(columnName));
+                pd.setPropertyURI(DomainUtil.createUniquePropertyURI(domainURI));
             }
 
             // try use existing SystemProperty PropertyDescriptor from Shared container.

api/src/org/labkey/api/exp/property/Domain.java

@@ -75,6 +75,9 @@ public interface Domain extends IPropertyType
     DomainProperty addProperty();
     DomainProperty addProperty(PropertyStorageSpec spec);
 
+    @Deprecated // Use addProperty(PropertyStorageSpec)
+    DomainProperty addProperty(PropertyStorageSpec spec, @Nullable String propSuffix);
+
     List<BaseColumnInfo> getColumns(TableInfo sourceTable, ColumnInfo lsidColumn, Container container, User user);
 
     boolean isMutable();

api/src/org/labkey/api/exp/property/DomainUtil.java

@@ -47,6 +47,7 @@
 import org.labkey.api.exp.DomainDescriptor;
 import org.labkey.api.exp.ExperimentException;
 import org.labkey.api.exp.Lsid;
+import org.labkey.api.exp.LsidManager;
 import org.labkey.api.exp.OntologyManager;
 import org.labkey.api.exp.PropertyDescriptor;
 import org.labkey.api.exp.PropertyType;
@@ -1090,7 +1091,7 @@ public static DomainProperty addProperty(Domain domain, GWTPropertyDescriptor pd
         LOG.debug("Adding property for " + pd.getName());
         if (StringUtils.isEmpty(pd.getPropertyURI()))
         {
-            String newPropertyURI = createUniquePropertyURI(domain.getTypeURI() + "#" + Lsid.encodePart(pd.getName()), propertyUrisInUse);
+            String newPropertyURI = createUniquePropertyURI(domain.getTypeURI(), null, propertyUrisInUse);
             assert !propertyUrisInUse.contains(newPropertyURI) : "Attempting to assign an existing PropertyURI to a new property";
             pd.setPropertyURI(newPropertyURI);
             propertyUrisInUse.add(newPropertyURI);
@@ -1107,8 +1108,20 @@ public static DomainProperty addProperty(Domain domain, GWTPropertyDescriptor pd
         return p;
     }
 
-    private static String createUniquePropertyURI(String base, Set<String> propertyUrisInUse)
+    public static String createUniquePropertyURI(String typeURI)
     {
+        return createUniquePropertyURI(typeURI, null, new CaseInsensitiveHashSet());
+    }
+
+    public static String createUniquePropertyURI(String typeURI, @Nullable String propSuffix, Set<String> propertyUrisInUse)
+    {
+        // Don't use long property names in URIs as it can create strings that are longer than the DB column length when encoded (Issue 53586)
+        if (propSuffix == null)
+            propSuffix = String.valueOf(LsidManager.getLsidPrefixDbSeq("Property", 1).next());
+        else
+            propSuffix = Lsid.encodePart(propSuffix);
+
+        String base = typeURI + "#" + propSuffix;
         String candidateURI = base;
         int i = 0;
 

api/src/org/labkey/api/issues/AbstractIssuesListDefDomainKind.java

@@ -19,6 +19,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.data.DbSchema;
@@ -325,7 +326,7 @@ public Domain createDomain(GWTDomain<GWTPropertyDescriptor> domain, IssuesDomain
                 Set<String> lowerReservedNames = reservedNames.stream().map(String::toLowerCase).collect(Collectors.toSet());
                 Set<String> existingProperties = newDomain.getProperties().stream().map(o -> o.getName().toLowerCase()).collect(Collectors.toSet());
                 Map<DomainProperty, Object> defaultValues = new HashMap<>();
-                Set<String> propertyUris = new HashSet<>();
+                Set<String> propertyUris = new CaseInsensitiveHashSet();
 
                 for (GWTPropertyDescriptor pd : properties)
                 {

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

@@ -17,6 +17,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
+import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.data.Container;
 import org.labkey.api.exp.ChangePropertyDescriptorException;
 import org.labkey.api.exp.Handler;
@@ -98,7 +99,7 @@ public Domain createDomain(GWTDomain<GWTPropertyDescriptor> gwtDomain, JSONObjec
             List<? extends GWTPropertyDescriptor> properties = gwtDomain.getFields();
             Domain newDomain = PropertyService.get().createDomain(container, domainURI, gwtDomain.getName(), templateInfo);
 
-            Set<String> propertyUris = new HashSet<>();
+            Set<String> propertyUris = new CaseInsensitiveHashSet();
             Map<DomainProperty, Object> defaultValues = new HashMap<>();
             try
             {

api/src/org/labkey/api/query/snapshot/AbstractSnapshotProvider.java

@@ -24,6 +24,7 @@
 import org.labkey.api.exp.PropertyType;
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.DomainProperty;
+import org.labkey.api.exp.property.DomainUtil;
 import org.labkey.api.exp.property.PropertyService;
 import org.labkey.api.query.CustomView;
 import org.labkey.api.query.QueryDefinition;
@@ -35,6 +36,7 @@
 import org.springframework.validation.BindException;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 /*
@@ -131,13 +133,15 @@ public static DomainProperty addAsDomainProperty(Domain domain, ColumnInfo colum
         if (name.contains("/"))
             name = name.replace('/', '.');
 
+        String  propertyURI = DomainUtil.createUniquePropertyURI(domain.getTypeURI());
+
         if (pd != null)
         {
             PropertyDescriptor newProp = pd.clone();
 
             // initialize so the domain doesn't get upset
             newProp.setContainer(domain.getContainer());
-            newProp.setPropertyURI(getPropertyURI(domain, column));
+            newProp.setPropertyURI(propertyURI);
             newProp.setPropertyId(0);
             newProp.setName(name);
             newProp.setLabel(column.getLabel());
@@ -161,16 +165,11 @@ public static DomainProperty addAsDomainProperty(Domain domain, ColumnInfo colum
             prop.setType(PropertyService.get().getType(domain.getContainer(), type.getXmlName()));
             prop.setDescription(column.getDescription());
             prop.setFormat(column.getFormat());
-            prop.setPropertyURI(getPropertyURI(domain, column));
+            prop.setPropertyURI(propertyURI);
         }
         return prop;
     }
 
-    public static String getPropertyURI(Domain domain, ColumnInfo column)
-    {
-        return domain.getTypeURI() + "." + column.getName();
-    }
-
     @Override
     public TableInfo getTableInfoQuerySnapshotDef()
     {

api/src/org/labkey/api/reports/model/ReportPropsManager.java

@@ -34,6 +34,7 @@
 import org.labkey.api.exp.PropertyType;
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.DomainProperty;
+import org.labkey.api.exp.property.DomainUtil;
 import org.labkey.api.exp.property.PropertyService;
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.security.User;
@@ -46,6 +47,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -84,11 +86,6 @@ public List<DomainProperty> getProperties(Container container)
         return properties;
     }
 
-    public void createProperty(Container container, User user, String name, String label, PropertyType type) throws Exception
-    {
-        ensureProperty(container, user, name, label, type);
-    }
-
     private Map<String, DomainProperty> getPropertyMap(Container container)
     {
         Domain domain = getDomain(container, false);
@@ -120,7 +117,7 @@ public synchronized DomainProperty ensureProperty(Container container, User user
                 prop.setName(name);
                 prop.setLabel(label);
                 prop.setType(PropertyService.get().getType(domain.getContainer(), type.getXmlName()));
-                prop.setPropertyURI(getPropertyURI(name, container));
+                prop.setPropertyURI(DomainUtil.createUniquePropertyURI(getDomainURI(container)));
 
                 dp = prop;
             }
@@ -209,11 +206,6 @@ private String getDomainURI(@NotNull Container container)
         return new Lsid("urn:lsid:labkey.com:" + NAMESPACE_PREFIX + ".Folder-" + container.getRowId() + ':' + TYPE_PROPERTIES).toString();
     }
 
-    private String getPropertyURI(String propertyName, Container container)
-    {
-        return getDomainURI(container) + '#' + propertyName;
-    }
-
     @Override
     public void containerDeleted(Container container, User user)
     {

assay/api-src/org/labkey/api/assay/nab/RenderAssayBean.java

@@ -328,7 +328,6 @@ public Pair<PropertyDescriptor, Object> getFitError(DilutionAssayRun.SampleResul
     {
         try
         {
-            Lsid fitErrorURI = new Lsid(DilutionDataHandler.NAB_PROPERTY_LSID_PREFIX, getAssay().getProtocol().getName(), DilutionDataHandler.FIT_ERROR_PROPERTY);
             PropertyDescriptor fitErrorPd =
                     _assay.getDataHandler().getPropertyDescriptor(container, getAssay().getProtocol(), DilutionDataHandler.FIT_ERROR_PROPERTY, new HashMap<>());
             if (null != fitErrorPd)

assay/api-src/org/labkey/api/assay/nab/query/CutoffValueTable.java

@@ -81,7 +81,9 @@ private SQLFragment getSelectedCurveFitIC(boolean oorIndicator)
         defaultICSQL.append(DilutionManager.getTableInfoNAbSpecimen(), "ns");
         defaultICSQL.append(", ");
         defaultICSQL.append(ExperimentService.get().getTinfoExperimentRun(), "er");
-        defaultICSQL.append(" WHERE op.PropertyId = pd.PropertyId AND pd.PropertyURI LIKE '%#" + DilutionAssayProvider.CURVE_FIT_METHOD_PROPERTY_NAME + "' AND ns.RowId = ");
+        defaultICSQL.append(" WHERE op.PropertyId = pd.PropertyId AND pd.Name = ? ");
+        defaultICSQL.add(DilutionAssayProvider.CURVE_FIT_METHOD_PROPERTY_NAME);
+        defaultICSQL.append("AND ns.RowId = ");
         defaultICSQL.append(ExprColumn.STR_TABLE_ALIAS);
         defaultICSQL.append(".NAbSpecimenID AND er.LSID = o.ObjectURI AND o.ObjectId = op.ObjectId AND er.RowId = ns.RunId)");
         defaultICSQL.append("\nWHEN 'Polynomial' THEN ");

assay/api-src/org/labkey/api/assay/nab/query/NAbSpecimenTable.java

@@ -104,7 +104,8 @@ private SQLFragment getSelectedCurveFitAUC(boolean positive)
         sql.append(OntologyManager.getTinfoPropertyDescriptor(), "pd");
         sql.append(", ");
         sql.append(ExperimentService.get().getTinfoExperimentRun(), "er");
-        sql.append(" WHERE op.PropertyId = pd.PropertyId AND pd.PropertyURI LIKE '%#" + DilutionAssayProvider.CURVE_FIT_METHOD_PROPERTY_NAME + "'");
+        sql.append(" WHERE op.PropertyId = pd.PropertyId AND pd.Name = ?");
+        sql.add(DilutionAssayProvider.CURVE_FIT_METHOD_PROPERTY_NAME);
         sql.append(" AND er.LSID = o.ObjectURI AND o.ObjectId = op.ObjectId AND er.RowId = " + ExprColumn.STR_TABLE_ALIAS + ".RunId)");
         sql.append("\nWHEN 'Polynomial' THEN ");
         sql.append(ExprColumn.STR_TABLE_ALIAS + ".");

assay/src/org/labkey/assay/plate/PlateManager.java

@@ -2349,7 +2349,7 @@ public Container getPlateMetadataDomainContainer(Container container)
                     if (existingProperties.contains(pd.getName()))
                         throw new IllegalStateException(String.format("Unable to create field: %s on domain: %s. The field already exists.", pd.getName(), metadataDomain.getTypeURI()));
 
-                    DomainUtil.addProperty(metadataDomain, pd, new HashMap<>(), new HashSet<>(), null);
+                    DomainUtil.addProperty(metadataDomain, pd, new HashMap<>(), new CaseInsensitiveHashSet(), null);
                 }
                 metadataDomain.save(user);
                 tx.commit();

assay/src/org/labkey/assay/plate/PlateMetadataDomainKind.java

@@ -17,6 +17,7 @@
 import org.labkey.api.exp.property.BaseAbstractDomainKind;
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.DomainProperty;
+import org.labkey.api.exp.property.DomainUtil;
 import org.labkey.api.exp.property.Lookup;
 import org.labkey.api.exp.property.PropertyService;
 import org.labkey.api.gwt.client.model.GWTDomain;
@@ -153,7 +154,7 @@ public void ensureDomainProperties(Domain domain, Container container)
             DomainProperty prop = domain.addProperty();
 
             prop.setName(spec.getName());
-            prop.setPropertyURI(getUniqueURI(typeUri + "#" + spec.getName(), propertyURIs));
+            prop.setPropertyURI(DomainUtil.createUniquePropertyURI(typeUri, null, propertyURIs));
             prop.setRangeURI(spec.getTypeURI());
             prop.setScale(spec.getSize());
             prop.setRequired(!spec.isNullable());
@@ -168,19 +169,6 @@ public void ensureDomainProperties(Domain domain, Container container)
         }
     }
 
-    private String getUniqueURI(String uri, Set<String> propertyURIs)
-    {
-        String result = uri;
-        int ordinal = 1;
-
-        while (propertyURIs.contains(result))
-        {
-            result = String.format("%s-%d", uri, ordinal++);
-        }
-        propertyURIs.add(result);
-        return result;
-    }
-
     @Override
     public String getStorageSchemaName()
     {

experiment/src/org/labkey/experiment/XarExporter.java

@@ -793,7 +793,8 @@ public void addDataClass(ExpDataClass dataClass) throws ExperimentException
         queueDomain(dataClass.getDomain());
     }
 
-    // Return the "name" portion of the propertyURI after the hash
+    // Return the "name" portion of the propertyURI after the hash (Issue 30718)
+    @Deprecated
     private String getPropertyName(DomainProperty dp)
     {
         String name = dp.getName();

experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java

@@ -7868,7 +7868,7 @@ public ExpDataClassImpl createDataClass(
             lowerReservedNames = emptySet();
 
         Map<DomainProperty, Object> defaultValues = new HashMap<>();
-        Set<String> propertyUris = new HashSet<>();
+        Set<String> propertyUris = new CaseInsensitiveHashSet();
         List<GWTPropertyDescriptor> calculatedFields = new ArrayList<>();
         for (GWTPropertyDescriptor pd : properties)
         {

experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java

@@ -33,6 +33,7 @@
 import org.labkey.api.audit.provider.FileSystemAuditProvider;
 import org.labkey.api.cache.Cache;
 import org.labkey.api.cache.CacheManager;
+import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.collections.LongArrayList;
 import org.labkey.api.collections.LongHashMap;
 import org.labkey.api.collections.LongHashSet;
@@ -787,7 +788,7 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri
         boolean hasNameProperty = false;
         String idUri1 = null, idUri2 = null, idUri3 = null, parentUri = null;
         Map<DomainProperty, Object> defaultValues = new HashMap<>();
-        Set<String> propertyUris = new HashSet<>();
+        Set<String> propertyUris = new CaseInsensitiveHashSet();
         List<GWTPropertyDescriptor> calculatedFields = new ArrayList<>();
         for (int i = 0; i < properties.size(); i++)
         {

experiment/src/org/labkey/experiment/api/VocabularyDomainKind.java

@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
+import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerType;
 import org.labkey.api.data.SQLFragment;
@@ -159,12 +160,13 @@ public Domain createDomain(GWTDomain domain, JSONObject arguments, Container con
         List<GWTPropertyDescriptor> properties = domain.getFields();
         Domain vocabularyDomain = PropertyService.get().createDomain(container, domainURI, domain.getName(), templateInfo);
 
-        Set<String> propertyUris = new HashSet<>();
+        Set<String> propertyUris = new CaseInsensitiveHashSet();
         Map<DomainProperty, Object> defaultValues = new HashMap<>();
         try
         {
             for (GWTPropertyDescriptor pd : properties)
             {
+                pd.setPropertyURI(DomainUtil.createUniquePropertyURI(vocabularyDomain.getTypeURI(), pd.getName(), propertyUris));
                 DomainUtil.addProperty(vocabularyDomain, pd, defaultValues, propertyUris, null);
             }
             vocabularyDomain.save(user);

experiment/src/org/labkey/experiment/api/property/DomainImpl.java

@@ -30,6 +30,7 @@
 import org.labkey.api.audit.AuditLogService;
 import org.labkey.api.audit.AuditTypeEvent;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
+import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.collections.Sets;
 import org.labkey.api.data.*;
 import org.labkey.api.data.dialect.SqlDialect;
@@ -1281,6 +1282,12 @@ public DomainProperty addProperty()
 
     @Override
     public DomainProperty addProperty(PropertyStorageSpec spec)
+    {
+        return addProperty(spec, null);
+    }
+
+    @Override
+    public DomainProperty addProperty(PropertyStorageSpec spec, @Nullable String propSuffix)
     {
         PropertyDescriptor pd = new PropertyDescriptor();
         pd.setContainer(getContainer());
@@ -1290,7 +1297,7 @@ public DomainProperty addProperty(PropertyStorageSpec spec)
         pd.setNullable(spec.isNullable());
 //        pd.setAutoIncrement(spec.isAutoIncrement());      // always false in PropertyDescriptor
         pd.setMvEnabled(spec.isMvEnabled());
-        pd.setPropertyURI(getTypeURI() + ":field-" + spec.getName());
+        pd.setPropertyURI(DomainUtil.createUniquePropertyURI(getTypeURI(), propSuffix, new CaseInsensitiveHashSet())); // Issue 53586
         pd.setDescription(spec.getDescription());
         pd.setImportAliases(spec.getImportAliases());
         pd.setScale(spec.getSize());