From dda44323392be8101e9b9fad71f16af861675ccf Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Tue, 14 Jan 2025 12:31:41 +0200 Subject: [PATCH] Fix JpaTarget entity graphs (#2198) Signed-off-by: Avgustin Marinov --- .../org/eclipse/hawkbit/repository/TargetManagement.java | 1 - .../org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java index c42224f26..7df5c6be0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java @@ -366,7 +366,6 @@ public interface TargetManagement { @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) Optional getByControllerID(@NotEmpty String controllerId); - /** * Gets a {@link Target} based a given controller id and includes the details specified by the details key. * 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 cd19db014..f845ebfc2 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 @@ -89,10 +89,7 @@ import org.springframework.util.ObjectUtils; @NamedAttributeNode("installedDistributionSet"), @NamedAttributeNode("assignedDistributionSet") }), @NamedEntityGraph(name = "Target.targetType", attributeNodes = { @NamedAttributeNode("targetType") }), - @NamedEntityGraph(name = "Target.installedDistributionSet", attributeNodes = { @NamedAttributeNode("installedDistributionSet") }, - subgraphs = { @NamedSubgraph( - name = "installedDistributionSet.optLockRevision", - attributeNodes = @NamedAttributeNode("optLockRevision")) }), + @NamedEntityGraph(name = "Target.installedDistributionSet", attributeNodes = { @NamedAttributeNode("installedDistributionSet") }), @NamedEntityGraph(name = "Target.assignedDistributionSet", attributeNodes = { @NamedAttributeNode("assignedDistributionSet") }), @NamedEntityGraph(name = "Target.autoConfirmationStatus", attributeNodes = { @NamedAttributeNode("autoConfirmationStatus") }), @NamedEntityGraph(name = "Target.tags", attributeNodes = { @NamedAttributeNode("tags") }),