From 1faba92ecc0bf7794b6a295c1e0d6c92a69acaec Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 27 May 2026 07:28:19 +0200 Subject: [PATCH] remove unused relationships --- .../java/com/commafeed/backend/model/FeedCategory.java | 9 --------- .../com/commafeed/backend/model/FeedEntryContent.java | 5 ----- .../com/commafeed/backend/opml/OPMLExporterTest.java | 10 ---------- 3 files changed, 24 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java index a5c3ac03..d1769013 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java @@ -1,13 +1,10 @@ package com.commafeed.backend.model; -import java.util.Set; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import lombok.Getter; @@ -30,12 +27,6 @@ public class FeedCategory extends AbstractModel { @ManyToOne(fetch = FetchType.LAZY) private FeedCategory parent; - @OneToMany(mappedBy = "parent") - private Set children; - - @OneToMany(mappedBy = "category") - private Set subscriptions; - private boolean collapsed; private int position; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java index 0440bf89..195164b7 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java @@ -1,14 +1,12 @@ package com.commafeed.backend.model; import java.sql.Types; -import java.util.Set; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Lob; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -78,9 +76,6 @@ public class FeedEntryContent extends AbstractModel { @Enumerated(EnumType.STRING) private Direction direction = Direction.UNKNOWN; - @OneToMany(mappedBy = "content") - private Set entries; - public boolean equivalentTo(FeedEntryContent c) { if (c == null) { return false; diff --git a/commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java b/commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java index 164537a8..ee047efa 100644 --- a/commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java +++ b/commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java @@ -1,7 +1,6 @@ package com.commafeed.backend.opml; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import org.junit.jupiter.api.Assertions; @@ -48,24 +47,15 @@ class OPMLExporterTest { cat1.setId(1L); cat1.setName("cat1"); cat1.setParent(null); - cat1.setChildren(new HashSet<>()); - cat1.setSubscriptions(new HashSet<>()); cat2.setId(2L); cat2.setName("cat2"); cat2.setParent(cat1); - cat2.setChildren(new HashSet<>()); - cat2.setSubscriptions(new HashSet<>()); - - cat1.getChildren().add(cat2); rootFeed.setCategory(null); cat1Feed.setCategory(cat1); cat2Feed.setCategory(cat2); - cat1.getSubscriptions().add(cat1Feed); - cat2.getSubscriptions().add(cat2Feed); - categories.add(cat1); categories.add(cat2);