From cb524dec647fd3ba8039b5d6ebba465ce0511a1e Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Thu, 27 Nov 2008 11:23:15 +0000
Subject: [PATCH] [LMS-639] change: - Wwitch on the cache for
SamplePE/SamplePropertyPE.
SVN: 9108
---
.../shared/dto/ExperimentTypePropertyTypePE.java | 14 ++++++--------
.../shared/dto/IEntityTypePropertyType.java | 8 +++++++-
.../shared/dto/MaterialTypePropertyTypePE.java | 14 ++++++--------
.../cisd/openbis/generic/shared/dto/SamplePE.java | 4 +++-
.../generic/shared/dto/SamplePropertyPE.java | 4 +++-
.../shared/dto/SampleTypePropertyTypePE.java | 14 ++++++--------
.../generic/shared/util/HibernateUtils.java | 6 +++---
7 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java
index 6294f21b519..814217f6f21 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java
@@ -53,10 +53,6 @@ public class ExperimentTypePropertyTypePE extends EntityTypePropertyTypePE
public static final ExperimentTypePropertyTypePE[] EMPTY_ARRAY =
new ExperimentTypePropertyTypePE[0];
- //
- // EntityTypePropertyTypePE
- //
-
@NotNull(message = ValidationMessages.EXPERIMENT_TYPE_NOT_NULL_MESSAGE)
@ManyToOne(fetch = FetchType.EAGER, targetEntity = ExperimentTypePE.class)
@JoinColumn(name = ColumnNames.EXPERIMENT_TYPE_COLUMN)
@@ -65,10 +61,12 @@ public class ExperimentTypePropertyTypePE extends EntityTypePropertyTypePE
return entityType;
}
- @SuppressWarnings("unused")
- // for Hibernate only
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "entityTypePropertyType", targetEntity = ExperimentPropertyPE.class)
- private Set<EntityPropertyPE> getPropertyValues()
+ //
+ // EntityTypePropertyTypePE
+ //
+
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entityTypePropertyType", targetEntity = ExperimentPropertyPE.class)
+ public Set<EntityPropertyPE> getPropertyValues()
{
return propertyValues;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java
index 9e9c4ba17a7..bb66570fcf4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java
@@ -16,9 +16,10 @@
package ch.systemsx.cisd.openbis.generic.shared.dto;
+import java.util.Set;
/**
- * An entity property is composed of:
+ * An entity type property type is composed of:
* <ol>
* <li>{@link IIdHolder#getId()}</li>
* <li>{@link #getEntityType()}</li>
@@ -33,4 +34,9 @@ public interface IEntityTypePropertyType extends IIdHolder
* Returns the entity type for this entity type property type.
*/
public EntityTypePE getEntityType();
+
+ /**
+ * Returns the set of {@link EntityPropertyPE} associated with this entity type property type.
+ */
+ public Set<EntityPropertyPE> getPropertyValues();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java
index 108bab4ba22..7f4cac9b0fa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java
@@ -57,10 +57,6 @@ public class MaterialTypePropertyTypePE extends EntityTypePropertyTypePE
{
}
- //
- // EntityTypePropertyTypePE
- //
-
@NotNull(message = ValidationMessages.MATERIAL_TYPE_NOT_NULL_MESSAGE)
@ManyToOne(fetch = FetchType.EAGER, targetEntity = MaterialTypePE.class)
@JoinColumn(name = ColumnNames.MATERIAL_TYPE_COLUMN)
@@ -69,10 +65,12 @@ public class MaterialTypePropertyTypePE extends EntityTypePropertyTypePE
return entityType;
}
- @SuppressWarnings("unused")
- // for Hibernate only
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "entityTypePropertyType", targetEntity = MaterialPropertyPE.class)
- private Set<EntityPropertyPE> getPropertyValues()
+ //
+ // EntityTypePropertyTypePE
+ //
+
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entityTypePropertyType", targetEntity = MaterialPropertyPE.class)
+ public Set<EntityPropertyPE> getPropertyValues()
{
return propertyValues;
}
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 23b95fd2253..71e1e2be6c1 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
@@ -43,6 +43,8 @@ import javax.persistence.Transient;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.Check;
import org.hibernate.annotations.Generated;
import org.hibernate.annotations.GenerationTime;
@@ -208,7 +210,7 @@ public class SamplePE implements IIdAndCodeHolder, Comparable<SamplePE>,
}
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entity")
- // @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+ @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@IndexedEmbedded
private Set<SamplePropertyPE> getSampleProperties()
{
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 0db81baf7a4..5daa0847a98 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
@@ -28,6 +28,8 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.NotNull;
import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants;
@@ -41,7 +43,7 @@ import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants;
@Table(name = TableNames.SAMPLE_PROPERTIES_TABLE, uniqueConstraints =
{ @UniqueConstraint(columnNames =
{ ColumnNames.SAMPLE_COLUMN, ColumnNames.SAMPLE_TYPE_PROPERTY_TYPE_COLUMN }) })
-// @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class SamplePropertyPE extends EntityPropertyPE
{
private static final long serialVersionUID = GenericSharedConstants.VERSION;
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 a39a9780bbf..a0f6445c33e 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
@@ -65,10 +65,6 @@ public class SampleTypePropertyTypePE extends EntityTypePropertyTypePE
this.displayed = displayed;
}
- //
- // EntityTypePropertyTypePE
- //
-
@NotNull(message = ValidationMessages.SAMPLE_TYPE_NOT_NULL_MESSAGE)
@ManyToOne(fetch = FetchType.EAGER, targetEntity = SampleTypePE.class)
@JoinColumn(name = ColumnNames.SAMPLE_TYPE_COLUMN)
@@ -77,10 +73,12 @@ public class SampleTypePropertyTypePE extends EntityTypePropertyTypePE
return entityType;
}
- @SuppressWarnings("unused")
- // for Hibernate only
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "entityTypePropertyType", targetEntity = SamplePropertyPE.class)
- private Set<EntityPropertyPE> getPropertyValues()
+ //
+ // EntityTypePropertyTypePE
+ //
+
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "entityTypePropertyType", targetEntity = SamplePropertyPE.class)
+ public Set<EntityPropertyPE> getPropertyValues()
{
return propertyValues;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java
index a10e6b6b305..36e19322f9e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java
@@ -66,10 +66,10 @@ public final class HibernateUtils
}
/**
- * For given <i>idHolder</i> returns corresponding {@link Long} id.
+ * For given <var>idHolder</var> returns corresponding {@link Long} id.
* <p>
- * Do not use this method. It is a hack till we use full object instead of id in proxied objects
- * for DAO requests.
+ * Internally checks whether given {@link IIdHolder} is a {@link HibernateProxy} and handles
+ * correspondingly.
* </p>
*/
public final static Long getId(final IIdHolder idHolder)
--
GitLab