DomainUtil.createUniquePropertyURI to use CaseInsensitiveHashSet

Author: cnathe

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

@@ -246,7 +246,7 @@ public static ImportPropertyDescriptorsList getImportPropertyDescriptors(Collect
             String propertyURI = StringUtils.trimToEmpty(pd.getPropertyURI());
             if (propertyURI.isEmpty())
             {
-                pd.setPropertyURI(DomainUtil.createUniquePropertyURI(domainURI, new HashSet<>()));
+                pd.setPropertyURI(DomainUtil.createUniquePropertyURI(domainURI));
             }
 
             // try use existing SystemProperty PropertyDescriptor from Shared container.

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

@@ -1108,6 +1108,11 @@ public static DomainProperty addProperty(Domain domain, GWTPropertyDescriptor pd
         return p;
     }
 
+    public static String createUniquePropertyURI(String typeURI)
+    {
+        return createUniquePropertyURI(typeURI, new CaseInsensitiveHashSet());
+    }
+
     public static String createUniquePropertyURI(String typeURI, Set<String> propertyUrisInUse)
     {
         // Don't use property name in URIs as it can create strings that are longer than the DB column length when encoded (Issue 53586)

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

@@ -133,7 +133,7 @@ public static DomainProperty addAsDomainProperty(Domain domain, ColumnInfo colum
         if (name.contains("/"))
             name = name.replace('/', '.');
 
-        String  propertyURI = DomainUtil.createUniquePropertyURI(domain.getTypeURI(), new HashSet<>());
+        String  propertyURI = DomainUtil.createUniquePropertyURI(domain.getTypeURI());
 
         if (pd != null)
         {

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

@@ -117,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(DomainUtil.createUniquePropertyURI(getDomainURI(container), new HashSet<>()));
+                prop.setPropertyURI(DomainUtil.createUniquePropertyURI(getDomainURI(container)));
 
                 dp = prop;
             }

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

@@ -1290,7 +1290,7 @@ public DomainProperty addProperty(PropertyStorageSpec spec)
         pd.setNullable(spec.isNullable());
 //        pd.setAutoIncrement(spec.isAutoIncrement());      // always false in PropertyDescriptor
         pd.setMvEnabled(spec.isMvEnabled());
-        pd.setPropertyURI(DomainUtil.createUniquePropertyURI(getTypeURI(), new HashSet<>())); // Issue 53586
+        pd.setPropertyURI(DomainUtil.createUniquePropertyURI(getTypeURI())); // Issue 53586
         pd.setDescription(spec.getDescription());
         pd.setImportAliases(spec.getImportAliases());
         pd.setScale(spec.getSize());

issues/src/org/labkey/issue/model/IssueListDef.java

@@ -288,7 +288,7 @@ private void ensureDomainProperties(Domain domain, AbstractIssuesListDefDomainKi
             DomainProperty prop = domain.addProperty();
 
             prop.setName(spec.getName());
-            prop.setPropertyURI(DomainUtil.createUniquePropertyURI(typeUri, new HashSet<>()));
+            prop.setPropertyURI(DomainUtil.createUniquePropertyURI(typeUri));
             prop.setRangeURI(spec.getTypeURI());
             prop.setScale(spec.getSize());
             prop.setRequired(!spec.isNullable());

list/src/org/labkey/list/model/ListDefinitionImpl.java

@@ -448,7 +448,7 @@ private void ensureKey()
         }
 
         DomainProperty prop = domain.addProperty();
-        prop.setPropertyURI(DomainUtil.createUniquePropertyURI(domain.getTypeURI(), new HashSet<>()));
+        prop.setPropertyURI(DomainUtil.createUniquePropertyURI(domain.getTypeURI()));
         prop.setName(getKeyName());
         prop.setType(PropertyService.get().getType(domain.getContainer(), getKeyType().getPropertyType().getXmlName()));