split client and server into maven modules

commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java

@@ -0,0 +1,33 @@
+package com.commafeed.backend.model;
+
+import java.io.Serializable;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.TableGenerator;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * Abstract model for all entities, defining id and table generator
+ * 
+ */
+@SuppressWarnings("serial")
+@MappedSuperclass
+@Getter
+@Setter
+public abstract class AbstractModel implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "gen")
+	@TableGenerator(
+			name = "gen",
+			table = "hibernate_sequences",
+			pkColumnName = "sequence_name",
+			valueColumnName = "sequence_next_hi_value",
+			allocationSize = 1000)
+	private Long id;
+}

commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java

@@ -0,0 +1,129 @@
+package com.commafeed.backend.model;
+
+import java.util.Date;
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDS")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class Feed extends AbstractModel {
+
+	/**
+	 * The url of the feed
+	 */
+	@Column(length = 2048, nullable = false)
+	private String url;
+
+	/**
+	 * cache the url after potential http 30x redirects
+	 */
+	@Column(name = "url_after_redirect", length = 2048, nullable = false)
+	private String urlAfterRedirect;
+
+	@Column(length = 2048, nullable = false)
+	private String normalizedUrl;
+
+	@Column(length = 40, nullable = false)
+	private String normalizedUrlHash;
+
+	/**
+	 * The url of the website, extracted from the feed
+	 */
+	@Column(length = 2048)
+	private String link;
+
+	/**
+	 * Last time we tried to fetch the feed
+	 */
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastUpdated;
+
+	/**
+	 * Last publishedDate value in the feed
+	 */
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastPublishedDate;
+
+	/**
+	 * date of the last entry of the feed
+	 */
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastEntryDate;
+
+	/**
+	 * error message while retrieving the feed
+	 */
+	@Column(length = 1024)
+	private String message;
+
+	/**
+	 * times we failed to retrieve the feed
+	 */
+	private int errorCount;
+
+	/**
+	 * feed refresh is disabled until this date
+	 */
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date disabledUntil;
+
+	/**
+	 * http header returned by the feed
+	 */
+	@Column(length = 64)
+	private String lastModifiedHeader;
+
+	/**
+	 * http header returned by the feed
+	 */
+	@Column(length = 255)
+	private String etagHeader;
+
+	/**
+	 * average time between entries in the feed
+	 */
+	private Long averageEntryInterval;
+
+	/**
+	 * last hash of the content of the feed xml
+	 */
+	@Column(length = 40)
+	private String lastContentHash;
+
+	/**
+	 * detected hub for pubsubhubbub
+	 */
+	@Column(length = 2048)
+	private String pushHub;
+
+	/**
+	 * detected topic for pubsubhubbub
+	 */
+	@Column(length = 2048)
+	private String pushTopic;
+
+	@Column(name = "push_topic_hash", length = 2048)
+	private String pushTopicHash;
+
+	/**
+	 * last time we subscribed for that topic on that hub
+	 */
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date pushLastPing;
+
+	@OneToMany(mappedBy = "feed")
+	private Set<FeedSubscription> subscriptions;
+
+}

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

@@ -0,0 +1,43 @@
+package com.commafeed.backend.model;
+
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDCATEGORIES")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class FeedCategory extends AbstractModel {
+
+	@Column(length = 128, nullable = false)
+	private String name;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(nullable = false)
+	private User user;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	private FeedCategory parent;
+
+	@OneToMany(mappedBy = "parent")
+	private Set<FeedCategory> children;
+
+	@OneToMany(mappedBy = "category")
+	private Set<FeedSubscription> subscriptions;
+
+	private boolean collapsed;
+
+	private Integer position;
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java

@@ -0,0 +1,56 @@
+package com.commafeed.backend.model;
+
+import java.util.Date;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDENTRIES")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class FeedEntry extends AbstractModel {
+
+	@Column(length = 2048, nullable = false)
+	private String guid;
+
+	@Column(length = 40, nullable = false)
+	private String guidHash;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Feed feed;
+
+	@OneToOne(fetch = FetchType.LAZY, optional = false)
+	@JoinColumn(nullable = false, updatable = false)
+	private FeedEntryContent content;
+
+	@Column(length = 2048)
+	private String url;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date inserted;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date updated;
+
+	@OneToMany(mappedBy = "entry", cascade = CascadeType.REMOVE)
+	private Set<FeedEntryStatus> statuses;
+
+	@OneToMany(mappedBy = "entry", cascade = CascadeType.REMOVE)
+	private Set<FeedEntryTag> tags;
+
+}

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

@@ -0,0 +1,82 @@
+package com.commafeed.backend.model;
+
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.hibernate.annotations.Type;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDENTRYCONTENTS")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class FeedEntryContent extends AbstractModel {
+
+	@Column(length = 2048)
+	private String title;
+
+	@Column(length = 40)
+	private String titleHash;
+
+	@Lob
+	@Column(length = Integer.MAX_VALUE)
+	@Type(type = "org.hibernate.type.TextType")
+	private String content;
+
+	@Column(length = 40)
+	private String contentHash;
+
+	@Column(name = "author", length = 128)
+	private String author;
+
+	@Column(length = 2048)
+	private String enclosureUrl;
+
+	@Column(length = 255)
+	private String enclosureType;
+
+	@Lob
+	@Column(length = Integer.MAX_VALUE)
+	@Type(type = "org.hibernate.type.TextType")
+	private String mediaDescription;
+
+	@Column(length = 2048)
+	private String mediaThumbnailUrl;
+
+	private Integer mediaThumbnailWidth;
+	private Integer mediaThumbnailHeight;
+
+	@Column(length = 4096)
+	private String categories;
+
+	@OneToMany(mappedBy = "content")
+	private Set<FeedEntry> entries;
+
+	public boolean equivalentTo(FeedEntryContent c) {
+		if (c == null) {
+			return false;
+		}
+
+		return new EqualsBuilder().append(title, c.title)
+				.append(content, c.content)
+				.append(author, c.author)
+				.append(enclosureUrl, c.enclosureUrl)
+				.append(enclosureType, c.enclosureType)
+				.append(mediaDescription, c.mediaDescription)
+				.append(mediaThumbnailUrl, c.mediaThumbnailUrl)
+				.append(mediaThumbnailWidth, c.mediaThumbnailWidth)
+				.append(mediaThumbnailHeight, c.mediaThumbnailHeight)
+				.append(categories, c.categories)
+				.build();
+	}
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java

@@ -0,0 +1,71 @@
+package com.commafeed.backend.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDENTRYSTATUSES")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class FeedEntryStatus extends AbstractModel {
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(nullable = false)
+	private FeedSubscription subscription;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(nullable = false)
+	private FeedEntry entry;
+
+	@Column(name = "read_status")
+	private boolean read;
+	private boolean starred;
+
+	@Transient
+	private boolean markable;
+
+	@Transient
+	private List<FeedEntryTag> tags = new ArrayList<>();
+
+	/**
+	 * Denormalization starts here
+	 */
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(nullable = false)
+	private User user;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date entryInserted;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date entryUpdated;
+
+	public FeedEntryStatus() {
+
+	}
+
+	public FeedEntryStatus(User user, FeedSubscription subscription, FeedEntry entry) {
+		setUser(user);
+		setSubscription(subscription);
+		setEntry(entry);
+		setEntryInserted(entry.getInserted());
+		setEntryUpdated(entry.getUpdated());
+	}
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java

@@ -0,0 +1,40 @@
+package com.commafeed.backend.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDENTRYTAGS")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class FeedEntryTag extends AbstractModel {
+
+	@JoinColumn(name = "user_id")
+	@ManyToOne(fetch = FetchType.LAZY)
+	private User user;
+
+	@JoinColumn(name = "entry_id")
+	@ManyToOne(fetch = FetchType.LAZY)
+	private FeedEntry entry;
+
+	@Column(name = "name", length = 40)
+	private String name;
+
+	public FeedEntryTag() {
+	}
+
+	public FeedEntryTag(User user, FeedEntry entry, String name) {
+		this.name = name;
+		this.entry = entry;
+		this.user = user;
+	}
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java

@@ -0,0 +1,46 @@
+package com.commafeed.backend.model;
+
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "FEEDSUBSCRIPTIONS")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class FeedSubscription extends AbstractModel {
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(nullable = false)
+	private User user;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(nullable = false)
+	private Feed feed;
+
+	@Column(length = 128, nullable = false)
+	private String title;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	private FeedCategory category;
+
+	@OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE)
+	private Set<FeedEntryStatus> statuses;
+
+	private Integer position;
+
+	@Column(name = "filtering_expression", length = 4096)
+	private String filter;
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/Models.java

@@ -0,0 +1,29 @@
+package com.commafeed.backend.model;
+
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
+
+public class Models {
+
+	/**
+	 * initialize a proxy
+	 */
+	public static void initialize(Object proxy) throws HibernateException {
+		Hibernate.initialize(proxy);
+	}
+
+	/**
+	 * extract the id from the proxy without initializing it
+	 */
+	public static Long getId(AbstractModel model) {
+		if (model instanceof HibernateProxy) {
+			LazyInitializer lazyInitializer = ((HibernateProxy) model).getHibernateLazyInitializer();
+			if (lazyInitializer.isUninitialized()) {
+				return (Long) lazyInitializer.getIdentifier();
+			}
+		}
+		return model.getId();
+	}
+}

commafeed-server/src/main/java/com/commafeed/backend/model/User.java

@@ -0,0 +1,65 @@
+package com.commafeed.backend.model;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.apache.commons.lang3.time.DateUtils;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "USERS")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class User extends AbstractModel {
+
+	@Column(length = 32, nullable = false, unique = true)
+	private String name;
+
+	@Column(length = 255, unique = true)
+	private String email;
+
+	@Column(length = 256, nullable = false)
+	private byte[] password;
+
+	@Column(length = 40, unique = true)
+	private String apiKey;
+
+	@Column(length = 8, nullable = false)
+	private byte[] salt;
+
+	@Column(nullable = false)
+	private boolean disabled;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastLogin;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date created;
+
+	@Column(length = 40)
+	private String recoverPasswordToken;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date recoverPasswordTokenDate;
+
+	@Column(name = "last_full_refresh")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date lastFullRefresh;
+
+	public boolean shouldRefreshFeedsAt(Date when) {
+		return lastFullRefresh == null || lastFullRefreshMoreThan30MinutesBefore(when);
+	}
+
+	private boolean lastFullRefreshMoreThan30MinutesBefore(Date when) {
+		return lastFullRefresh.before(DateUtils.addMinutes(when, -30));
+	}
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java

@@ -0,0 +1,43 @@
+package com.commafeed.backend.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "USERROLES")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class UserRole extends AbstractModel {
+
+	public enum Role {
+		USER, ADMIN
+	}
+
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id", nullable = false)
+	private User user;
+
+	@Column(name = "roleName", nullable = false)
+	@Enumerated(EnumType.STRING)
+	private Role role;
+
+	public UserRole() {
+
+	}
+
+	public UserRole(User user, Role role) {
+		this.user = user;
+		this.role = role;
+	}
+
+}

commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java

@@ -0,0 +1,79 @@
+package com.commafeed.backend.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Type;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "USERSETTINGS")
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class UserSettings extends AbstractModel {
+
+	public enum ReadingMode {
+		all, unread
+	}
+
+	public enum ReadingOrder {
+		asc, desc
+	}
+
+	public enum ViewMode {
+		title, expanded
+	}
+
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id", nullable = false, unique = true)
+	private User user;
+
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
+	private ReadingMode readingMode;
+
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
+	private ReadingOrder readingOrder;
+
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
+	private ViewMode viewMode;
+
+	@Column(name = "user_lang", length = 4)
+	private String language;
+
+	private boolean showRead;
+	private boolean scrollMarks;
+
+	@Column(length = 32)
+	private String theme;
+
+	@Lob
+	@Column(length = Integer.MAX_VALUE)
+	@Type(type = "org.hibernate.type.TextType")
+	private String customCss;
+
+	@Column(name = "scroll_speed")
+	private int scrollSpeed;
+
+	private boolean email;
+	private boolean gmail;
+	private boolean facebook;
+	private boolean twitter;
+	private boolean tumblr;
+	private boolean pocket;
+	private boolean instapaper;
+	private boolean buffer;
+
+}