From 8b8abb51e4ed49b0c290d13913e8c0413ecbfb73 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Tue, 30 Sep 2008 19:53:46 +0000
Subject: [PATCH] change: - Simplifying '*PropertyPE'. remove: - No longer
valid TODO.
SVN: 8505
---
.../generic/shared/dto/EntityPropertyPE.java | 9 ++++--
.../generic/shared/dto/ExperimentPE.java | 4 +--
.../shared/dto/ExperimentPropertyPE.java | 30 +++++-------------
.../generic/shared/dto/MaterialPE.java | 4 +--
.../shared/dto/MaterialPropertyPE.java | 31 +++++--------------
.../openbis/generic/shared/dto/SamplePE.java | 4 +--
.../generic/shared/dto/SamplePropertyPE.java | 26 ++++------------
.../shared/dto/SampleTypePropertyTypePE.java | 5 ---
8 files changed, 34 insertions(+), 79 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java
index 11c66bcb5d0..143c0aa6d22 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java
@@ -60,10 +60,10 @@ public abstract class EntityPropertyPE extends HibernateAbstractRegistratrationH
protected transient Long id;
- protected transient Long entityId;
-
protected EntityTypePropertyTypePE entityTypePropertyType;
+ protected IIdAndCodeHolder entity;
+
public <T extends EntityTypePropertyTypePE> void setEntityTypePropertyType(
final T entityTypePropertyType)
{
@@ -80,7 +80,10 @@ public abstract class EntityPropertyPE extends HibernateAbstractRegistratrationH
this.value = value;
}
- public abstract void setEntity(final IIdAndCodeHolder entity);
+ public final void setEntity(final IIdAndCodeHolder entity)
+ {
+ this.entity = entity;
+ }
@Column(name = ColumnNames.VALUE)
@Length(max = 1024, message = ValidationMessages.VALUE_LENGTH_MESSAGE)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java
index fdc27b8f1db..59943daff52 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java
@@ -176,7 +176,7 @@ public class ExperimentPE extends HibernateAbstractRegistratrationHolder impleme
this.invalidation = invalidation;
}
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "experiment")
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entity")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private List<ExperimentPropertyPE> getExperimentProperties()
{
@@ -203,7 +203,7 @@ public class ExperimentPE extends HibernateAbstractRegistratrationHolder impleme
{
parent.getProperties().remove(experimentProperty);
}
- experimentProperty.setExperiment(this);
+ experimentProperty.setEntity(this);
}
setExperimentProperties(properties);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java
index 6e9adc95cee..ecd7ef3fa5a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java
@@ -52,7 +52,11 @@ public class ExperimentPropertyPE extends EntityPropertyPE
public static final List<ExperimentPropertyPE> EMPTY_LIST = Collections.emptyList();
- private ExperimentPE experiment;
+ @Transient
+ public final ExperimentPE getExperiment()
+ {
+ return (ExperimentPE) getEntity();
+ }
//
// EntityPropertyPE
@@ -74,28 +78,10 @@ public class ExperimentPropertyPE extends EntityPropertyPE
return id;
}
- @Transient
- public final IIdAndCodeHolder getEntity()
- {
- return getExperiment();
- }
-
- @Override
- public void setEntity(final IIdAndCodeHolder entity)
- {
- assert entity instanceof ExperimentPE;
- setExperiment((ExperimentPE) entity);
- }
-
- @ManyToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.LAZY, targetEntity = ExperimentPE.class)
@JoinColumn(name = ColumnNames.EXPERIMENT_COLUMN, updatable = false)
- public ExperimentPE getExperiment()
- {
- return experiment;
- }
-
- void setExperiment(final ExperimentPE experiment)
+ public final IIdAndCodeHolder getEntity()
{
- this.experiment = experiment;
+ return entity;
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
index ea92bea498a..ad7737f6ed1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
@@ -142,7 +142,7 @@ public class MaterialPE extends HibernateAbstractRegistratrationHolder implement
this.inhibitorOf = inhibitorOf;
}
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "material")
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entity")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private List<MaterialPropertyPE> getMaterialProperties()
{
@@ -173,7 +173,7 @@ public class MaterialPE extends HibernateAbstractRegistratrationHolder implement
{
parent.getProperties().remove(materialProperty);
}
- materialProperty.setMaterial(this);
+ materialProperty.setEntity(this);
}
setMaterialProperties(properties);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java
index 289b815729e..ce34ee79017 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java
@@ -53,7 +53,11 @@ public class MaterialPropertyPE extends EntityPropertyPE
public static final List<MaterialPropertyPE> EMPTY_LIST =
Collections.<MaterialPropertyPE> emptyList();
- private MaterialPE material;
+ @Transient
+ public final MaterialPE getMaterial()
+ {
+ return (MaterialPE) getEntity();
+ }
//
// EntityPropertyPE
@@ -75,29 +79,10 @@ public class MaterialPropertyPE extends EntityPropertyPE
return id;
}
- @Transient
- public final IIdAndCodeHolder getEntity()
- {
- return getMaterial();
- }
-
- @Override
- public void setEntity(final IIdAndCodeHolder entity)
- {
- assert entity instanceof MaterialPE;
- setMaterial((MaterialPE) entity);
- }
-
- @ManyToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.LAZY, targetEntity = MaterialPE.class)
@JoinColumn(name = ColumnNames.MATERIAL_COLUMN, updatable = false)
- public MaterialPE getMaterial()
- {
- return material;
- }
-
- void setMaterial(final MaterialPE material)
+ public final IIdAndCodeHolder getEntity()
{
- this.material = material;
+ return entity;
}
-
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
index f27725e6287..da7441f5db1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
@@ -173,7 +173,7 @@ public class SamplePE extends HibernateAbstractRegistratrationHolder implements
this.sampleType = sampleType;
}
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "sample")
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entity")
private List<SamplePropertyPE> getSampleProperties()
{
return properties;
@@ -367,7 +367,7 @@ public class SamplePE extends HibernateAbstractRegistratrationHolder implements
{
parent.getProperties().remove(sampleProperty);
}
- sampleProperty.setSample(this);
+ sampleProperty.setEntity(this);
}
setSampleProperties(properties);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java
index 019e121c5cc..727a3c017d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java
@@ -53,18 +53,10 @@ public class SamplePropertyPE extends EntityPropertyPE
public static final List<SamplePropertyPE> EMPTY_LIST =
Collections.<SamplePropertyPE> emptyList();
- private SamplePE sample;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = ColumnNames.SAMPLE_COLUMN, updatable = false)
- public SamplePE getSample()
- {
- return sample;
- }
-
- public void setSample(final SamplePE sample)
+ @Transient
+ public final SamplePE getSample()
{
- this.sample = sample;
+ return (SamplePE) getEntity();
}
//
@@ -87,16 +79,10 @@ public class SamplePropertyPE extends EntityPropertyPE
return id;
}
- @Transient
+ @ManyToOne(fetch = FetchType.LAZY, targetEntity = SamplePE.class)
+ @JoinColumn(name = ColumnNames.SAMPLE_COLUMN, updatable = false)
public final IIdAndCodeHolder getEntity()
{
- return getSample();
- }
-
- @Override
- public void setEntity(final IIdAndCodeHolder entity)
- {
- assert entity instanceof SamplePE;
- setSample((SamplePE) entity);
+ return entity;
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java
index cc909d5a280..ab325b4cdc9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java
@@ -47,11 +47,6 @@ public class SampleTypePropertyTypePE extends EntityTypePropertyTypePE
public static final SampleTypePropertyTypePE[] EMPTY_ARRAY = new SampleTypePropertyTypePE[0];
- public SampleTypePropertyTypePE()
- {
-
- }
-
//
// EntityTypePropertyTypePE
//
--
GitLab