[LMS-2104] minor changes in names

SVN: 21181

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java

@@ -610,7 +610,8 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
             }
         }
 
-        if (false == notYetLoadedChilren.isEmpty()) {
+        if (false == notYetLoadedChilren.isEmpty())
+        {
             Long2ObjectMap<ExternalData> childrenSecondPass =
                     createPrimaryDatasets(asList(query.getDatasets(notYetLoadedChilren)));
             fullContextMap.putAll(childrenSecondPass);
@@ -697,10 +698,10 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
         dataSet.setRegistrator(getOrCreateRegistrator(record.pers_id_registerer));
         dataSet.setDataSetProperties(new ArrayList<IEntityProperty>());
 
-        if (record.ctnr_parent_id != null)
+        if (record.ctnr_id != null)
         {
             ContainerDataSet container = new ContainerDataSet();
-            container.setId(record.ctnr_parent_id);
+            container.setId(record.ctnr_id);
             dataSet.setContainer(container);
         }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java

@@ -37,7 +37,7 @@ public class DatasetRecord extends CodeRecord
 
     public Integer ctnr_order;
 
-    public Long ctnr_parent_id;
+    public Long ctnr_id;
 
     // ---- from external_data table
     // ---- can be NULL in case of container(virtual) data sets

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ColumnNames.java

@@ -48,7 +48,7 @@ public final class ColumnNames
 
     public static final String DATA_PARENT_COLUMN = "data_id_parent";
 
-    public static final String DATA_CONTAINER_PARENT_COLUMN = "ctnr_parent_id";
+    public static final String DATA_CONTAINER_COLUMN = "ctnr_id";
 
     public static final String DATA_CONTAINER_ORDER_COLUMN = "ctnr_order";
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java

@@ -49,6 +49,7 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.GenerationTime;
+import org.hibernate.annotations.OrderBy;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
@@ -116,7 +117,7 @@ public class DataPE extends AbstractIdAndCodeHolder<DataPE> implements
 
     private Set<DataPE> children = new HashSet<DataPE>();
 
-    private DataPE containerParent = null;
+    private DataPE container = null;
 
     private List<DataPE> containedDataSets = new ArrayList<DataPE>();
 
@@ -421,26 +422,40 @@ public class DataPE extends AbstractIdAndCodeHolder<DataPE> implements
 
     @SuppressWarnings("unused")
     @ManyToOne(fetch = FetchType.EAGER, targetEntity = DataPE.class)
-    @JoinColumn(name = ColumnNames.DATA_CONTAINER_PARENT_COLUMN)
-    private DataPE getContainerParentInternal()
+    @JoinColumn(name = ColumnNames.DATA_CONTAINER_COLUMN)
+    private DataPE getContainerInternal()
     {
-        return containerParent;
+        return container;
     }
 
-    @SuppressWarnings("unused")
-    private void setContainerParentInternal(final DataPE containerParent)
+    private void setContainerInternal(final DataPE container)
     {
-        this.containerParent = containerParent;
+        this.container = container;
     }
 
-    
-    @OneToMany(mappedBy = "containerParentInternal", fetch = FetchType.LAZY)
-    public List<DataPE> getContainedDatas()
+    public void addComponent(final DataPE component)
+    {
+        assert component != null;
+        this.containedDataSets.add(component);
+        component.setContainerInternal(component);
+    }
+
+    /** removes connection with specified parent */
+    public void removeVirtualComponent(final DataPE component)
+    {
+        assert component != null;
+        this.containedDataSets.remove(component);
+        component.setContainerInternal(null);
+    }
+
+    @OneToMany(mappedBy = "virtualParentInternal", fetch = FetchType.LAZY)
+    @OrderBy(clause = ColumnNames.DATA_CONTAINER_ORDER_COLUMN)
+    public List<DataPE> getContainedDataSets()
     {
         return containedDataSets;
     }
 
-    public void setContainedDatas(List<DataPE> containedDataSets)
+    public void setContainedDataSets(List<DataPE> containedDataSets)
     {
         this.containedDataSets = containedDataSets;
     }
@@ -597,13 +612,28 @@ public class DataPE extends AbstractIdAndCodeHolder<DataPE> implements
         return code;
     }
 
+    @Transient
     /**
      * @return <code>true</code> if this is a container data set.
      */
+    public boolean isContainer()
+    {
+        return dataSetType != null && getDataSetType().isContainerType();
+    }
+
+    @Transient
+    /**
+     * @return <code>true</code> if this is a data set with external data.
+     */
+    public boolean isExternalData()
+    {
+        return isPlaceholder() == false && isContainer() == false;
+    }
+
     @Transient
-    public boolean isContainerDataSet()
+    public ExternalDataPE tryAsExternalData()
     {
-        return dataSetType != null && dataSetType.isContainerType();
+        return (this instanceof ExternalDataPE) ? (ExternalDataPE) this : null;
     }
 
 }
\ No newline at end of file

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java

@@ -141,7 +141,7 @@ public class ExternalDataTranslator
             boolean loadSampleProperties, final LoadableFields... withExperimentFields)
     {
         ExternalData externalData = null;
-        if (externalDataPE.isContainerDataSet())
+        if (externalDataPE.isContainer())
         {
             externalData = translateContainerDataSetProperties(externalDataPE);
         } else
@@ -297,9 +297,9 @@ public class ExternalDataTranslator
             ContainerDataSet containerDataSet)
     {
         List<ExternalData> containedDataSets = new ArrayList<ExternalData>();
-        if (HibernateUtils.isInitialized(externalDataPE.getContainedDatas()))
+        if (HibernateUtils.isInitialized(externalDataPE.getContainedDataSets()))
         {
-            for (DataPE childPE : externalDataPE.getContainedDatas())
+            for (DataPE childPE : externalDataPE.getContainedDataSets())
             {
                 containedDataSets.add(translateBasicProperties(childPE));
             }

openbis/source/sql/generic/071/schema-071.sql

@@ -2,7 +2,7 @@
 
 CREATE TABLE CONTROLLED_VOCABULARIES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,DESCRIPTION DESCRIPTION_2000,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID NOT NULL,IS_MANAGED_INTERNALLY BOOLEAN_CHAR NOT NULL DEFAULT 'F',IS_INTERNAL_NAMESPACE BOOLEAN_CHAR NOT NULL DEFAULT 'F',DBIN_ID TECH_ID NOT NULL, MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, IS_CHOSEN_FROM_LIST BOOLEAN_CHAR NOT NULL DEFAULT TRUE, SOURCE_URI CHARACTER VARYING(250));
 CREATE TABLE CONTROLLED_VOCABULARY_TERMS (ID TECH_ID NOT NULL,CODE OBJECT_NAME NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,COVO_ID TECH_ID NOT NULL,PERS_ID_REGISTERER TECH_ID NOT NULL,LABEL COLUMN_LABEL, DESCRIPTION DESCRIPTION_2000, ORDINAL ORDINAL_INT NOT NULL, IS_OFFICIAL BOOLEAN_CHAR NOT NULL DEFAULT 'T');
-CREATE TABLE DATA (ID TECH_ID NOT NULL,CODE CODE,DSTY_ID TECH_ID NOT NULL,DAST_ID TECH_ID NOT NULL,EXPE_ID TECH_ID NOT NULL,DATA_PRODUCER_CODE CODE,PRODUCTION_TIMESTAMP TIME_STAMP,SAMP_ID TECH_ID,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID,IS_PLACEHOLDER BOOLEAN_CHAR DEFAULT 'F',IS_VALID BOOLEAN_CHAR DEFAULT 'T', MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, IS_DERIVED BOOLEAN_CHAR NOT NULL, CTNR_ORDER INTEGER, CTNR_PARENT_ID TECH_ID DEFAULT NULL);
+CREATE TABLE DATA (ID TECH_ID NOT NULL,CODE CODE,DSTY_ID TECH_ID NOT NULL,DAST_ID TECH_ID NOT NULL,EXPE_ID TECH_ID NOT NULL,DATA_PRODUCER_CODE CODE,PRODUCTION_TIMESTAMP TIME_STAMP,SAMP_ID TECH_ID,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,PERS_ID_REGISTERER TECH_ID,IS_PLACEHOLDER BOOLEAN_CHAR DEFAULT 'F',IS_VALID BOOLEAN_CHAR DEFAULT 'T', MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, IS_DERIVED BOOLEAN_CHAR NOT NULL, CTNR_ORDER INTEGER, CTNR_ID TECH_ID DEFAULT NULL);
 CREATE TABLE DATABASE_INSTANCES (ID TECH_ID NOT NULL,CODE CODE NOT NULL,UUID CODE NOT NULL,IS_ORIGINAL_SOURCE BOOLEAN_CHAR NOT NULL DEFAULT 'F',REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP);
 CREATE TABLE DATA_SET_RELATIONSHIPS (DATA_ID_PARENT TECH_ID NOT NULL,DATA_ID_CHILD TECH_ID NOT NULL);
 CREATE TABLE DATA_STORES (ID TECH_ID NOT NULL,DBIN_ID TECH_ID NOT NULL,CODE CODE NOT NULL,DOWNLOAD_URL VARCHAR(1024) NOT NULL,REMOTE_URL VARCHAR(250) NOT NULL,SESSION_TOKEN VARCHAR(50) NOT NULL,REGISTRATION_TIMESTAMP TIME_STAMP_DFL NOT NULL DEFAULT CURRENT_TIMESTAMP,MODIFICATION_TIMESTAMP TIME_STAMP DEFAULT CURRENT_TIMESTAMP, IS_ARCHIVER_CONFIGURED BOOLEAN_CHAR NOT NULL DEFAULT 'F');
@@ -202,6 +202,7 @@ ALTER TABLE DATA ADD CONSTRAINT DATA_DSTY_FK FOREIGN KEY (DSTY_ID) REFERENCES DA
 ALTER TABLE DATA ADD CONSTRAINT DATA_EXPE_FK FOREIGN KEY (EXPE_ID) REFERENCES EXPERIMENTS(ID);
 ALTER TABLE DATA ADD CONSTRAINT DATA_SAMP_FK FOREIGN KEY (SAMP_ID) REFERENCES SAMPLES(ID);
 ALTER TABLE DATA ADD CONSTRAINT DATA_DAST_FK FOREIGN KEY (DAST_ID) REFERENCES DATA_STORES(ID);
+ALTER TABLE DATA ADD CONSTRAINT DATA_CTNR_FK FOREIGN KEY (CTNR_ID) REFERENCES DATA(ID);
 ALTER TABLE DATA ADD CONSTRAINT DATA_PERS_FK FOREIGN KEY (PERS_ID_REGISTERER) REFERENCES PERSONS(ID);
 ALTER TABLE DATA ADD CONSTRAINT DATA_CTNR_PARENT_FK FOREIGN KEY (CTNR_PARENT_ID) REFERENCES DATA(ID);
 ALTER TABLE DATA_SET_RELATIONSHIPS ADD CONSTRAINT DSRE_DATA_FK_CHILD FOREIGN KEY (DATA_ID_CHILD) REFERENCES DATA(ID);

openbis/source/sql/postgresql/migration/migration-070-071.sql

@@ -6,6 +6,5 @@ ALTER TABLE CONTROLLED_VOCABULARY_TERMS ADD COLUMN IS_OFFICIAL BOOLEAN_CHAR NOT
 --
 ALTER TABLE DATA_SET_TYPES ADD COLUMN IS_CONTAINER BOOLEAN_CHAR DEFAULT false;
 ALTER TABLE DATA ADD COLUMN CTNR_ORDER INTEGER;
-ALTER TABLE DATA ADD COLUMN CTNR_PARENT_ID TECH_ID DEFAULT NULL;
-ALTER TABLE DATA ADD CONSTRAINT DATA_CTNR_PARENT_FK FOREIGN KEY (CTNR_PARENT_ID) REFERENCES DATA(ID);
-
+ALTER TABLE DATA ADD COLUMN CTNR_ID TECH_ID DEFAULT NULL;
+ALTER TABLE DATA ADD CONSTRAINT DATA_CTNR_FK FOREIGN KEY (CTNR_ID) REFERENCES DATA(ID);
\ No newline at end of file

openbis/sourceTest/sql/postgresql/071/finish-071.sql

@@ -305,7 +305,7 @@ ALTER TABLE ONLY controlled_vocabulary_terms
 ALTER TABLE ONLY data_stores
     ADD CONSTRAINT dast_dbin_fk FOREIGN KEY (dbin_id) REFERENCES database_instances(id);
 ALTER TABLE ONLY data
-    ADD CONSTRAINT data_ctnr_parent_fk FOREIGN KEY (ctnr_parent_id) REFERENCES data(id);
+    ADD CONSTRAINT data_ctnr_fk FOREIGN KEY (ctnr_id) REFERENCES data(id);
 ALTER TABLE ONLY data
     ADD CONSTRAINT data_dast_fk FOREIGN KEY (dast_id) REFERENCES data_stores(id);
 ALTER TABLE ONLY data

openbis/sourceTest/sql/postgresql/071/schema-071.sql

@@ -381,7 +381,7 @@ CREATE TABLE data (
     samp_id tech_id,
     pers_id_registerer tech_id,
     ctnr_order integer,
-    ctnr_parent_id tech_id DEFAULT NULL::bigint
+    ctnr_id tech_id DEFAULT NULL::bigint
 );
 CREATE SEQUENCE data_id_seq
     START WITH 1