From 1e6fd6b801438ebf6eb47dc7bad2b625a244327a Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 17 Nov 2022 17:23:41 +0100
Subject: [PATCH] Modified the cascade behavior
---
.../at/tuwien/entities/container/image/ContainerImage.java | 4 ++--
.../container/image/ContainerImageEnvironmentItem.java | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index aa42dee40e..84fb700e7b 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -61,8 +61,8 @@ public class ContainerImage {
@Column(nullable = false)
private Integer defaultPort;
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @JoinColumn(name = "iid", insertable = false, updatable = false)
+ @ToString.Exclude
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image")
private List<ContainerImageEnvironmentItem> environment;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image")
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java
index 809766022d..208c2143cd 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java
@@ -46,6 +46,13 @@ public class ContainerImageEnvironmentItem {
@Enumerated(EnumType.STRING)
private ContainerImageEnvironmentItemType type;
+ @org.springframework.data.annotation.Transient
+ @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinColumns({
+ @JoinColumn(name = "iid", referencedColumnName = "id", insertable = false, updatable = false)
+ })
+ private ContainerImage image;
+
@Column(nullable = false, updatable = false)
@CreatedDate
private Instant created;
--
GitLab