From 2d0c0a59894b6f26bb29a692af604ff145083aec Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Fri, 15 Nov 2024 11:59:37 +0200
Subject: [PATCH] Fix CascadeType.REMOVE on ManyToMany (#2029)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .../hawkbit/repository/jpa/model/JpaDistributionSet.java      | 4 ++--
 .../hawkbit/repository/jpa/model/JpaSoftwareModule.java       | 2 +-
 .../org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java
index 9a85b5e87..d8c8d6b30 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java
@@ -86,7 +86,7 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implemen
     @NotNull
     private DistributionSetType type;
 
-    @ManyToMany(targetEntity = JpaSoftwareModule.class, fetch = FetchType.LAZY, cascade = { CascadeType.REMOVE })
+    @ManyToMany(targetEntity = JpaSoftwareModule.class, fetch = FetchType.LAZY)
     @JoinTable(
             name = "sp_ds_module",
             joinColumns = {
@@ -99,7 +99,7 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implemen
                             foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_ds_module_module")) })
     private Set<SoftwareModule> modules;
 
-    @ManyToMany(cascade = { CascadeType.REMOVE }, targetEntity = JpaDistributionSetTag.class)
+    @ManyToMany(targetEntity = JpaDistributionSetTag.class)
     @JoinTable(
             name = "sp_ds_dstag",
             joinColumns = {
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java
index 597f7756f..11b1193b0 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java
@@ -105,7 +105,7 @@ public class JpaSoftwareModule extends AbstractJpaNamedVersionedEntity implement
 
     @ToString.Exclude
     @Getter(AccessLevel.NONE)
-    @ManyToMany(mappedBy = "modules", targetEntity = JpaDistributionSet.class, fetch = FetchType.LAZY, cascade = { CascadeType.REMOVE })
+    @ManyToMany(mappedBy = "modules", targetEntity = JpaDistributionSet.class, fetch = FetchType.LAZY)
     private List<DistributionSet> assignedTo;
 
     /**
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
index b0849a3fb..bb44c7ca2 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
@@ -151,7 +151,7 @@ public class JpaTarget extends AbstractJpaNamedEntity implements Target, EventAw
     @JoinColumn(name = "target_type", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_target_relation_target_type"))
     private TargetType targetType;
 
-    @ManyToMany(cascade = { CascadeType.REMOVE }, targetEntity = JpaTargetTag.class)
+    @ManyToMany(targetEntity = JpaTargetTag.class)
     @JoinTable(
             name = "sp_target_target_tag",
             joinColumns = {