Skip to content

Commit a9d3202

Browse files
authored
Merge pull request DSpace#12422 from 4Science/task/main/DURACOM-479
Removed unnecessary CascadeType.PERSIST and ResourcePolicy manual eviction
2 parents 36b3f5c + 2047af2 commit a9d3202

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.time.LocalDate;
1111
import java.util.Objects;
1212

13-
import jakarta.persistence.CascadeType;
1413
import jakarta.persistence.Column;
1514
import jakarta.persistence.Entity;
1615
import jakarta.persistence.FetchType;
@@ -56,7 +55,7 @@ public class ResourcePolicy implements ReloadableEntity<Integer> {
5655
@SequenceGenerator(name = "resourcepolicy_seq", sequenceName = "resourcepolicy_seq", allocationSize = 1)
5756
private Integer id;
5857

59-
@ManyToOne(fetch = FetchType.EAGER, cascade = {CascadeType.PERSIST})
58+
@ManyToOne(fetch = FetchType.EAGER)
6059
@JoinColumn(name = "dspace_object")
6160
private DSpaceObject dSpaceObject;
6261

dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.sql.SQLException;
1313
import javax.sql.DataSource;
1414

15-
import org.dspace.authorize.ResourcePolicy;
1615
import org.dspace.content.Bitstream;
1716
import org.dspace.content.Bundle;
1817
import org.dspace.content.Collection;
@@ -271,12 +270,6 @@ public <E extends ReloadableEntity> void uncacheEntity(E entity) throws SQLExcep
271270
uncacheEntity(handle);
272271
}
273272
}
274-
275-
if (Hibernate.isInitialized(dso.getResourcePolicies())) {
276-
for (ResourcePolicy policy : Utils.emptyIfNull(dso.getResourcePolicies())) {
277-
uncacheEntity(policy);
278-
}
279-
}
280273
}
281274

282275
// ITEM

0 commit comments

Comments
 (0)