Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

major improvement in the way data is stored

Browse Source
This commit is contained in:
Athou
2013-04-08 13:06:53 +02:00
parent 028982477e
commit cf7d4cce9c
14 changed files with 274 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
View File

@@ -13,7 +13,7 @@ public class FeedEntryStatus extends AbstractModel {
@ManyToOne
@JoinColumn(nullable = false)
private User user;
private FeedSubscription subscription;
@ManyToOne
@JoinColumn(nullable = false)
@@ -23,12 +23,12 @@ public class FeedEntryStatus extends AbstractModel {
private boolean read;
private boolean starred;
public User getUser() {
return user;
public FeedSubscription getSubscription() {
return subscription;
}
public void setUser(User user) {
this.user = user;
public void setSubscription(FeedSubscription subscription) {
this.subscription = subscription;
}
public FeedEntry getEntry() {

59
src/main/java/com/commafeed/backend/model/extended/FeedEntryWithStatus.java
View File

@@ -1,59 +0,0 @@
package com.commafeed.backend.model.extended;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedEntryStatus;
public class FeedEntryWithStatus {
private FeedEntry entry;
private FeedEntryStatus status;
public FeedEntryWithStatus(FeedEntry entry, FeedEntryStatus status) {
this.entry = entry;
this.status = status;
}
@Override
public int hashCode() {
return new HashCodeBuilder(17, 37).append(entry.getId())
.append(status == null ? null : status.getId()).toHashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (obj == this) {
return true;
}
if (obj.getClass() != getClass()) {
return false;
}
FeedEntryWithStatus rhs = (FeedEntryWithStatus) obj;
return new EqualsBuilder()
.append(status == null ? null : status.getId(),
rhs.status == null ? null : rhs.status.getId())
.append(entry.getId(), rhs.entry.getId()).isEquals();
}
public FeedEntry getEntry() {
return entry;
}
public void setEntry(FeedEntry entry) {
this.entry = entry;
}
public FeedEntryStatus getStatus() {
return status;
}
public void setStatus(FeedEntryStatus status) {
this.status = status;
}
}