CC code review

Author: XingY

experiment/src/org/labkey/experiment/XarReader.java

@@ -97,7 +97,6 @@
 import org.labkey.api.exp.api.ExperimentService;
 import org.labkey.api.exp.api.SampleTypeService;
 import org.labkey.api.exp.property.Domain;
-import org.labkey.api.exp.property.DomainKind;
 import org.labkey.api.exp.property.DomainProperty;
 import org.labkey.api.exp.property.PropertyService;
 import org.labkey.api.exp.query.ExpMaterialTable;
@@ -894,10 +893,6 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti
 
         try
         {
-            DomainKind<?> kind = domain.getDomainKind();
-            if (kind != null)
-                domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117
-
             domain.save(getUser());
             DefaultValueService.get().setDefaultValues(domain.getContainer(), newDefaultValues);
         }

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

@@ -8074,8 +8074,6 @@ else if (domain.getPropertyByName(propertyName) != null) // issue 25275
         {
             OntologyManager.ensureObject(c, lsid.toString());
 
-            if (kind != null)
-                domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c));
             domain.save(u, options == null ? null : options.getAuditRecordMap(), calculatedFields);
             impl.save(u);
 

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

@@ -835,10 +835,7 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri
         Domain domain = PropertyService.get().createDomain(c, lsid, name, templateInfo);
         DomainKind<?> kind = domain.getDomainKind();
         if (kind != null)
-        {
             domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField));
-            domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); // GitHub Issue 1117
-        }
 
         Set<String> reservedNames = kind.getReservedPropertyNames(domain, u);
         Set<String> reservedPrefixes = kind.getReservedPropertyNamePrefixes();

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

@@ -213,7 +213,10 @@ private String _create(DbScope scope, DomainKind<?> kind, Domain domain, boolean
             indices.addAll(domain.getPropertyIndices());
             change.setIndexedColumns(domain, indices);
 
-            change.setForeignKeys(domain.getPropertyForeignKeys());
+            // GitHub Issue 1117
+            Set<PropertyStorageSpec.ForeignKey> foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer()));
+            foreignKeys.addAll(domain.getPropertyForeignKeys());
+            change.setForeignKeys(foreignKeys);
 
             try
             {