BIS-341 / SP-536 : Fix for case where both component and container are...

BIS-341 / SP-536 : Fix for case where both component and container are identified by only their codes and space is read from default space of the import file

SVN: 28559

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java

@@ -278,7 +278,6 @@ public class SampleDAO extends AbstractGenericEntityWithPropertiesDAO<SamplePE>
 
         Criteria criteria = createSpaceCriteria(space);
         addSampleCodesCriterion(criteria, sampleCodes, containerCodeOrNull);
-        criteria.setFetchMode("contained", FetchMode.JOIN);
         List<SamplePE> result = cast(criteria.list());
         if (operationLog.isDebugEnabled())
         {

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifier.java

@@ -102,9 +102,17 @@ public class NormalizedSampleIdentifier
                     + " and " + sample.getContainerIdentifier());
         } else if (sample.getCurrentContainerIdentifier() != null)
         {
-            String[] split = sample.getCurrentContainerIdentifier().split("/");
-            this.containerSpace = split[1];
-            this.containerCode = split[2];
+            String containerIdentifier = sample.getCurrentContainerIdentifier();
+            if (containerIdentifier.contains("/"))
+            {
+                String[] split = sample.getCurrentContainerIdentifier().split("/");
+                this.containerSpace = split[1];
+                this.containerCode = split[2];
+            } else
+            {
+                this.containerSpace = space;
+                this.containerCode = containerIdentifier;
+            }
         }
     }
 

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportRegistrationTest.java

@@ -203,7 +203,31 @@ public class GeneralBatchImportRegistrationTest extends MainSuite
 
         assertThat(browserEntryOf(component), hasSpace(defaultSpace));
         assertThat(browserEntryOf(component), hasContainer(container));
+    }
+
+    @Test
+    public void containerColumnCanContainOnlyCodeOfContainerIfDefaultSpaceOfImportFileIsSet()
+            throws Exception
+    {
+        GeneralBatchImportFile file =
+                create(aGeneralBatchImportFile()
+                        .withSampleContainerColumn()
+                        .withDefaultSpace(defaultSpace));
+
+        Sample container =
+                create(in(file),
+                        aSample().ofType(basic).in(defaultSpace),
+                        IdentifiedBy.CODE);
+
+        Sample component =
+                create(in(file),
+                        aSample().ofType(componentType).containedBy(container),
+                        IdentifiedBy.SUBCODE);
 
+        generalBatchImport(file);
+
+        assertThat(browserEntryOf(component), hasSpace(defaultSpace));
+        assertThat(browserEntryOf(component), hasContainer(container));
     }
 
     @Test(expectedExceptions = CommandNotSuccessful.class)
@@ -261,24 +285,6 @@ public class GeneralBatchImportRegistrationTest extends MainSuite
         assertThat(browserEntryOf(sample), containsValue(propertyType.getLabel(), propertyValue));
     }
 
-    @Test(enabled = false)
-    public void IdentifierColumnCanBeEmptyForSamplesWhoseTypeDefinesTheirCodesToBeCreatedAutomatically()
-            throws Exception
-    {
-        SampleType sampleType = create(aSampleType().thatGeneratesCodes());
-        PropertyType propertyType = create(aVarcharPropertyType());
-        create(aSamplePropertyTypeAssignment().with(sampleType).with(propertyType));
-
-        GeneralBatchImportFile file =
-                create(aGeneralBatchImportFile().withDefaultSpace(defaultSpace));
-        create(in(file), aSample().ofType(sampleType).withProperty(propertyType,
-                randomValue()).in(sampleSpace));
-
-        generalBatchImport(file);
-
-        Thread.sleep(10000000);
-    }
-
     @Override
     public void fixture()
     {