Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-09-25 05:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused relationships

Browse Source
This commit is contained in:
Athou
2026-05-27 07:28:19 +02:00
parent b93fc86663
commit 1faba92ecc
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java
View File

@@ -1,13 +1,10 @@
package com.commafeed.backend.model; package com.commafeed.backend.model;
import java.util.Set;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.FetchType; import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Getter; import lombok.Getter;
@@ -30,12 +27,6 @@ public class FeedCategory extends AbstractModel {
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
private FeedCategory parent; private FeedCategory parent;
@OneToMany(mappedBy = "parent")
private Set<FeedCategory> children;
@OneToMany(mappedBy = "category")
private Set<FeedSubscription> subscriptions;
private boolean collapsed; private boolean collapsed;
private int position; private int position;

5
commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
View File

@@ -1,14 +1,12 @@
package com.commafeed.backend.model; package com.commafeed.backend.model;
import java.sql.Types; import java.sql.Types;
import java.util.Set;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import jakarta.persistence.Lob; import jakarta.persistence.Lob;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -78,9 +76,6 @@ public class FeedEntryContent extends AbstractModel {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private Direction direction = Direction.UNKNOWN; private Direction direction = Direction.UNKNOWN;
@OneToMany(mappedBy = "content")
private Set<FeedEntry> entries;
public boolean equivalentTo(FeedEntryContent c) { public boolean equivalentTo(FeedEntryContent c) {
if (c == null) { if (c == null) {
return false; return false;

10
commafeed-server/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java
View File

@@ -1,7 +1,6 @@
package com.commafeed.backend.opml; package com.commafeed.backend.opml;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
@@ -48,24 +47,15 @@ class OPMLExporterTest {
cat1.setId(1L); cat1.setId(1L);
cat1.setName("cat1"); cat1.setName("cat1");
cat1.setParent(null); cat1.setParent(null);
cat1.setChildren(new HashSet<>());
cat1.setSubscriptions(new HashSet<>());
cat2.setId(2L); cat2.setId(2L);
cat2.setName("cat2"); cat2.setName("cat2");
cat2.setParent(cat1); cat2.setParent(cat1);
cat2.setChildren(new HashSet<>());
cat2.setSubscriptions(new HashSet<>());
cat1.getChildren().add(cat2);
rootFeed.setCategory(null); rootFeed.setCategory(null);
cat1Feed.setCategory(cat1); cat1Feed.setCategory(cat1);
cat2Feed.setCategory(cat2); cat2Feed.setCategory(cat2);
cat1.getSubscriptions().add(cat1Feed);
cat2.getSubscriptions().add(cat2Feed);
categories.add(cat1); categories.add(cat1);
categories.add(cat2); categories.add(cat2);